From a6b67cd167567ec61314d032e91f818be850d67d Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:14:21 +0000
Subject: [PATCH] Sailwing and Pupperon

Taken from the October devs. Updated Feradactyl credit from context clues.

Sailwing isn't animated despite the front sprite. It's also not in the game, so...
---
 gfx/pokemon/feradactyl/credit.txt        |   7 +++++--
 gfx/pokemon/pupperon/anim.asm            |  22 +++++++++++++++++++++-
 gfx/pokemon/pupperon/anim_idle.asm       |   5 ++++-
 gfx/pokemon/pupperon/back.png            | Bin 364 -> 352 bytes
 gfx/pokemon/pupperon/credit.txt          |   2 ++
 gfx/pokemon/pupperon/front.png           | Bin 468 -> 758 bytes
 gfx/pokemon/pupperon/shiny.pal           |   4 ++--
 gfx/pokemon/sailwing/Flying_fish_G98.gif | Bin 0 -> 6064 bytes
 gfx/pokemon/sailwing/anim.asm            |   1 +
 gfx/pokemon/sailwing/anim_idle.asm       |   1 +
 gfx/pokemon/sailwing/back.png            | Bin 0 -> 676 bytes
 gfx/pokemon/sailwing/credit.txt          |   6 ++++++
 gfx/pokemon/sailwing/front.png           | Bin 0 -> 777 bytes
 13 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 gfx/pokemon/pupperon/credit.txt
 create mode 100644 gfx/pokemon/sailwing/Flying_fish_G98.gif
 create mode 100644 gfx/pokemon/sailwing/anim.asm
 create mode 100644 gfx/pokemon/sailwing/anim_idle.asm
 create mode 100644 gfx/pokemon/sailwing/back.png
 create mode 100644 gfx/pokemon/sailwing/credit.txt
 create mode 100644 gfx/pokemon/sailwing/front.png

diff --git a/gfx/pokemon/feradactyl/credit.txt b/gfx/pokemon/feradactyl/credit.txt
index 4eb51da..7a3fcd2 100644
--- a/gfx/pokemon/feradactyl/credit.txt
+++ b/gfx/pokemon/feradactyl/credit.txt
@@ -1,2 +1,5 @@
-Sprite taken from Pokemon October, originally uncredited.
-https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx%2Fpokemon%2Fgargranite
\ No newline at end of file
+Sprite taken from Pokemon October, originally uncredited but seems to have been made by Poket.
+https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx%2Fpokemon%2Fgargranite
+
+https://x.com/Pokets3/status/1711804029083258977
+https://x.com/Pokets3/status/1863538367251587198
\ No newline at end of file
diff --git a/gfx/pokemon/pupperon/anim.asm b/gfx/pokemon/pupperon/anim.asm
index 875f7be..d799e5f 100644
--- a/gfx/pokemon/pupperon/anim.asm
+++ b/gfx/pokemon/pupperon/anim.asm
@@ -1 +1,21 @@
-	endanim
\ No newline at end of file
+	frame  0, 06
+	frame  1, 07
+	frame  2, 07
+	frame  1, 07
+	frame  2, 07
+	frame  1, 07
+	frame  2, 07
+	frame  0, 06
+	frame  3, 07
+	frame  4, 09
+	frame  3, 06
+	frame  4, 06
+	frame  5, 12
+	frame  4, 06
+	frame  3, 06
+	frame  4, 06
+	frame  6, 03
+	frame  7, 03
+	frame  8, 06
+	frame  0, 06
+	endanim
diff --git a/gfx/pokemon/pupperon/anim_idle.asm b/gfx/pokemon/pupperon/anim_idle.asm
index 875f7be..ee64adf 100644
--- a/gfx/pokemon/pupperon/anim_idle.asm
+++ b/gfx/pokemon/pupperon/anim_idle.asm
@@ -1 +1,4 @@
-	endanim
\ No newline at end of file
+	frame 1, 08	
+	frame 0, 08
+	frame 1, 08
+	endanim
diff --git a/gfx/pokemon/pupperon/back.png b/gfx/pokemon/pupperon/back.png
index 7155248b2b32735ef0cf313a4555704400cdfd77..465178ddc3ee3c35cb8e7bf80ba38e3704ac8bf1 100644
GIT binary patch
delta 325
zcmV-L0lNO|0^kCWB!2;OQb$4nuFf3k0000CP)t-s|NsB`wl=#b7XSbN?p%9?00033
zNkl<ZNQv!~!4iWo2t)(?|36CzNr<`;dub2FnNCOd!4l9?{_)GfFZH6=oAjy{Nf%*H
zPDx~XA(Di#AR&!MBDi465c7G{KM|n;*#h2O{UyEZKkWz`lz&p1*9qE}=yKPS9jVC9
zlliL8r=Gdq0Zq5t)CkLKgd*sa`aT4`0R<3u`ew@Fj*#JL=#?-rDk4raT_-FL*xO-*
zC()duqw@V(0WNUO$2J6@5&|o9{X*<ER)#(Rc-o`HS^*j=eVfh|Hm{HYrcVQMR{?%*
z`YUj*02kKJ<UZ8%BXDs9=j?|0;^@l&e+Z-o7xlSGM}RXx3HnJeV^6$B_XwM25D_>4
X_8$j6Na)-M00000NkvXXu0mjfhBuH-

delta 337
zcmV-X0j~bw0_*~iB!3K0OjJex|NsBBDU?bv0001~(;@Q!000DZQchF<|NsAOC`Nez
z009e0L_t(|+U=Fg7Q-M2M8nMg|8sqTBo;BdF6yQp&s<;v+UxqS*9&e-6375T#Y4&r
zkQUgVWWc7#uO4LC9}~Khl&C_W{B}Yz-_3PVqxdhuMUXe6>VHKBiCj)Gpb#e&bwJqH
znF9wP(`$lWQ_*jbE>S=<LukC~p8&&F4E+LxUy3HUnTW520!s=e8D@%kvh{$aCT?A0
zmXy`h`+Q*n;K6)2y#N~zHVLv2h##0*woegGx5a2-Eq)Bl^A<J*T#*hyToQf1p*8UY
zK>M&b&VZ36^Gd+`MyG>^fVpP)Ea5F+1fD=dXid_dQ`ZRWTivceRgKB3!xz6vdeboG
jkI3FVn{fZP`1|Vv++YPbd62+{00000NkvXXu0mjfj#!!)

diff --git a/gfx/pokemon/pupperon/credit.txt b/gfx/pokemon/pupperon/credit.txt
new file mode 100644
index 0000000..1ab9e97
--- /dev/null
+++ b/gfx/pokemon/pupperon/credit.txt
@@ -0,0 +1,2 @@
+Sprited by Scarlax for Pokemon October.
+https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx/pokemon/pupperon
\ No newline at end of file
diff --git a/gfx/pokemon/pupperon/front.png b/gfx/pokemon/pupperon/front.png
index ab59913ad64e15e4857dcce2237e0607ce5984c1..9d170ce39bf96264acea0e056ac6f608eb665a8d 100644
GIT binary patch
delta 748
zcmV<I0u%kz1NH@w7JmU~0s{a509e0KCIA2c19L)2R0s$N+u={(0000CP)t-s|NsB^
zurRnF5C8xG%y#*?0007(Nkl<ZcwX(7&ubG=5XWcVZZ>UA$RefWU_&J}C&3CHL=W!4
zgSRSFP-xLVAxF_myo!g4rFihrvlb&n1i>G#f;R;(f)^nYP=9M`Q;}k_O|s6sdArYR
zjMNG{B=F6=+1Z)*$(w9o2%8a+60b8-%fspIGI{X56kJw|`0}S=gV${sJ-@}?6ikeH
z?9D(Sqzo$KyqwXocC$*cXt`ju)n-|2v|3$`T`1g?HcAIzHg)k0)ThA0x^nrsxt>D-
z*@-^glH|+EXn&|{?1#a<Fszfe_q+@eu2BZ(_&3-J1BqVWlF-FyOa|*~0Pd?MRYo73
zJ6_aw$5ZuM9{6zKEG?dR^ejx3R4ly3``qxA#2(yR+?!`Zk1xB60oXlVwwZono#ULR
zPS$kC*mJa}f7y1I+XKUGvud~zm4w?s_CIoaNEw*hyno@gW4NhU=GL#ET>Ife_!txb
z+GDH2MWS^Cdy$)9@9Z&4_78CYViBiVVh@%dbJK0^GPgg3l{K*T{|-yX5-gp}w!gm6
zv6-JTYNFU^DsBX8^0vfnR<NuOM`<I_`~7LB3w0&Sd2}66G7HIhV;h_sN(<Vs#4-iK
zaJ#B@5`Rm#;qyEEN@`d@=MClfI<>3_Elf6@5%&7P+)(DO*VTDTxD8^%&PgzHa>UF@
zN6$%49yO7HW>wEg+g?@AC1|-|<A{b)Y+SjID0q5)Qry(^#NA<Tu*lp{9`tb)A*0+k
z#@y(}%QE4%_qgpCZiSees2Oe$bL)>M-1auNl4ap`Nk-hnw5PcV*V?A%lG@aY2*Q<!
zoBL7SlDGxS$@8SX?BD-?Ta4$VD7}x)Te=*dw>&pX+`gQNxe2!&adWX$&5erI-01gN
eb3^ZN+<pN(oNSV9c*B|i0000<MNUMnLSTYWfp;nZ

literal 468
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NV3?%C=ER6$F>?NMQuIw+Er9`YOBAh4d1BJv(
zTq8<?^V3So6N^$A+<jbt#we7f7AY9(nH07zc?eX(QBvUN4wNwlvKhP@H06O5OS+@4
zBLl<6e(pbstU$g&fKQ0)e<0YZImOEmq>u<OVUn%^P#I&Ax4X;#rR<-M0y#fCT^vIy
z=IovLaN<z~j+Rg<jvEa}*m%C&zpcAZ-2eZ5nPj2or}dbYec69;@55L=w}`fQcA4PZ
z()10UHL2|<rtd%hFfDVrLFTD7kLnH_$~klQT-TkMSN@*38GBRyd#u+|!E%lA%p6%u
z{+BNf@LzYn6=WD9P~drb&3eBbOYSC~m$JNjT)XA8Z;n&^)Wu~k{Htm;-!~K;E~-uI
zp0kXxa>3?GZpE!8YHOC{>(6iWTjle%+MMICgW!45XRPjdg;zwMiQn7KE4EH%m$=wV
zW{$dFwjCx3X^!u=9Mci~#`AIO9nR)@3HQ*RR9}&5lNQ(8Z@R^|KYA|vKlcxVQI_(e
T7!8pYP`G)z`njxgN@xNAF=nV}

diff --git a/gfx/pokemon/pupperon/shiny.pal b/gfx/pokemon/pupperon/shiny.pal
index 5c88669..bbab53d 100644
--- a/gfx/pokemon/pupperon/shiny.pal
+++ b/gfx/pokemon/pupperon/shiny.pal
@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
\ No newline at end of file
+	RGB 26, 20, 19
+	RGB 20, 10,  0
diff --git a/gfx/pokemon/sailwing/Flying_fish_G98.gif b/gfx/pokemon/sailwing/Flying_fish_G98.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c0d23c6a458135365c3f58222042c5dec135b4af
GIT binary patch
literal 6064
zcmZ?wbh9u|)L_tHC}&_${Lk&@8WQa67~pE8XTZ$J02KPk!pQ}sb$}SCNQ0pXNdN!;
zA4obxG(@cU0TKrT=2sHC?))=2<vCkm@hgq6`<K5OPB&^w$&5NUec{0cvo^bzq^m|h
z{&{y}ulJSHTUi{GpR_(%E8`*a^zstHj0qXpw|0G+a(+q6t5&W0Bgwh9_uMN=U(ox?
zQ1FzAp!;5-&F>vO;u5rNb1Z_IiZZJi^Fvbl%T-H)l_ocdmv`Iwiw4e~JlW8AN=u~s
zWah>0YRuLKu3W40Jy|vwMDwj*=&^peqTm+u?L|9x@gLrI;NYQEXJXDp9hYn4*>WLf
zs>-n|yQbLexaZn7^WN1bWsja0nBBdSeSiDwjX|1a?=?C#ZTCM9$XWGQ+GE3lgUv!h
z105{9n)l02gMwvI@O#G+|H!f&_xv1|u8=BVxb&!Xi%%{~h_9R3Rb*N(6*#-Q+t64w
zJ7$VGTClY8fP!UujQ8w)r8}ns!v+*8r$rB}j@qdy$GheHg=qmtuS^Tl+;Ok9xAX3m
zr@i}b&exgr{FqzH{>N(zQa(7f$u0fzRp&tzG*|?o!NLPf4Fi)})+$4TMd`=Na!7J1
zuMcX5B$wt%;+<u!np5&S>v}-RWlnuPI9z5*EP<vL=Ghj&)KbQ~ei1NOfT?BimIDX9
z=j=O{EOc1n^zjp*VA;Lq%C!cu(wpF5ac!S;Pi~pkspl#>YBwGOgXQ^hzw!%_IWy$G
zym<=`7Vgp1f-kiYS+=~PylnA*v~k<pw5cIN8}?+y<y)G>T=i_@jO(|so;K~0N4R98
ze~qoXNnJ&Dbq!;&T5*Na<e(fOm#N*2J$9|Z=G~yer9MFhShy_d&;=JRYYIGBHX2Ol
z-mu7H!wO(7+L66$H_z6EJ9i!2DsfQi+`@~Z%XrTp*U1z+b}O~s=FBbE_QtE%mX+*y
zaY<+5y(exVJ05SER`ua++jJ$l1NY^AoD>I@EgZsm9we16?<fiw-P^!IclEtO@2^f%
z?E|NKy<%IpUB)W%mCAe%W8br?+xqJ3D;=8~Yvme}n^<~6YGU$hqAHbogW7~#ruCT5
z>C2s=ICsusStHj@C-+|F-Uv|0tS|)TqfG`2xi&8G*q9)CaBc4nhh6^sN9KY;#{BGw
z^J@c7Xm;=%Iln4L?D+MH>2eZxq+FAxJbdy(ZO5}!3t}HUjBeb2Y4hXtudWB#85=x_
z{@#CQ7cgM7VmOo-!SxXvaV5+#Xwa<QYw<d^RYFEhCpn|iD>I16a8<U+F1b5b%ND<5
z)VpmN+wiSusmzLywd%?e(>IGJn_GJY?3;e&6=UK0Gs!};ie5FTux^YgPU3v|;fZhY
zt~aU+MDOgr{a2aU#!Ed&E{{1c$t$B+MYXdusz}O_d19VklVa}--OgTF!FepR=Lk)d
zU#PyKe6@KY_ew*bN)I=~%IN-O+95W&JN9|nCNEttUX^-C?MUJLy)qH$r%xDd4L%}&
zaZ6kOmIn_XJ$~|3loMYS46J{FwJ^B)1rf|^ki2|$_y2?y97{AfxxJ>PMR74pop}3)
z?PJXPRcmLPOwGBfbS`NL<D_Seic<|WIuATKFega0%S$#?-$~c;b*SL3SqpOh#B92B
z|3HN6wxjCr-Ne=G`;2V)otb&eB`SGKT6EmR8u^-AHQV!jCN{O(hdR$L7o1~1In}X2
zZ%Ie*l&of(c?q4GrScuKnA6vZw&^KvlD3^Tb-T4ymg%wMCr+L^tpxGdXk6lIPL1Yl
zV2Z}x(j3j%qd9vBmD1=PrO}){nzKRGH5iQ6*+ZfIMP#RTw3~vX#vW;7Lqw*RK^iO@
zy|*k{zdTuJx5w&z`vnhfKhk?_)ybo$qYQLPdA6KYY!fTGsIoR%bH{D}p88u4Ybwhg
wJiB)}_UXgydxu`Zhs^fA4#=^I`0Wnr*8U&xv7tddk~o@LY)4ZIQRB|m049YX3;+NC

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/sailwing/anim.asm b/gfx/pokemon/sailwing/anim.asm
new file mode 100644
index 0000000..875f7be
--- /dev/null
+++ b/gfx/pokemon/sailwing/anim.asm
@@ -0,0 +1 @@
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/sailwing/anim_idle.asm b/gfx/pokemon/sailwing/anim_idle.asm
new file mode 100644
index 0000000..875f7be
--- /dev/null
+++ b/gfx/pokemon/sailwing/anim_idle.asm
@@ -0,0 +1 @@
+	endanim
\ No newline at end of file
diff --git a/gfx/pokemon/sailwing/back.png b/gfx/pokemon/sailwing/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..f92a826e6e9e91df238b47e95a06f59ce062503a
GIT binary patch
literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq001xm001xu0ssI2*kEqZ00001b5ch_0Itp)
z=>Px%UP(kjR9J=WmqC)^FbqXyiYhn)#|bxJhjSBl6L#DrX2%VN<8Xwq(ky-=6xqQf
zJyrC=zq%S@Z0q@37Qrzy{U)ux4PaG(aw<SM6`-67P)-FXrvj8y0m`WW<y3%jDnL1{
zh{!qjZH$*z&N*iO4NPF@kIaYeyG-KC8ZXRD)D4X#%b~G&x?rpYqCIZFG<RLSjRjkB
z&iT;ETkTNKM8l4=OJi8&8$Ev3mO#@UH?N&AGg>}$X#3FN4|8}z_^9%Y%tB9gqD(hq
z`fW(dD2oMeWbkXnLGMvy|JW6oX?m^LDt*Q>9{oZi4(SDr5Lho8vu5(KzCKM)@LOiq
znHc<5w}o4#?CbMA^eEEV9ycbLFsp}<<f4=e7NTNx&}gQ|?LtH#5X;Si2vlF6@dic?
zNsP)jyTeKIC7C4H<94}+Ml<QRQ?6*q`HYU~{f*U35>mWD4-mCs#*!Gz1YPM5^ew<R
zfiMo;LsR(%UV>(KIH7H5+T%tD(5|mfr=)|9fRL(soO2Fqp<#BmJDhYIsiQA&JVpBT
z&9dL2Z>oi<E^@skYUP{CH>Nb0`)uyE4w?j*d_ZI7;J5qw%)@sJ3cQ?`8IN+Hd-nAi
ze(2*CSFmy-U#A?34HE<8zp;l^&5e!WadGE~;<@C@nZ`v(n?yq{a#U~QC&6Us^<0!G
zJ#H7B76`9T+<;E$Qy}LYjw4xuAGgcj_K%seug~ZdV?H^JPk(hVGf?7mo{~mP=kHH|
zG*ecKABAaF4ne!asT!wq^1K#n-Va3-r}txiVh=5Fh*Bo~NBslSc6*aN!I7o_0000<
KMNUMnLSTZQ<~b?=

literal 0
HcmV?d00001

diff --git a/gfx/pokemon/sailwing/credit.txt b/gfx/pokemon/sailwing/credit.txt
new file mode 100644
index 0000000..2d3f16b
--- /dev/null
+++ b/gfx/pokemon/sailwing/credit.txt
@@ -0,0 +1,6 @@
+Sprited by Scarlax for Pokemon October.
+https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx/pokemon
+
+Seemingly unused.
+https://discord.gg/btJHUKH5FU
+https://discord.com/channels/786134559330533377/786135501479608331/922058073344999444
\ No newline at end of file
diff --git a/gfx/pokemon/sailwing/front.png b/gfx/pokemon/sailwing/front.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b107309b6db5af851e16c50ecc838d768911bb3
GIT binary patch
literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq001Ze00BS<0{{R3`S8x%00001b5ch_0Itp)
z=>Px#3{Xr|MgRZ*Kv;lSsQ3T?0LznOP5=M`t4TybRA_<inv0IaAP7Z8{{Nr1DhMJz
zvae)jFgvqNdwWHzoX|{4f6)-(PDh`$5B8(AvZ;_Qp98OVXkN-Pqhkr!`=hJR_oK9y
zSRI>8f}Aa(bTkiPQX=WFe4|`)gyg4&(xV(tuuvOTUAYta_G*~RSr$mo{14fXhhqB1
zHn<i6Rvk38jvdLT=<8pRRQth>W27m|<+yyMc?}?4YM+ceQg5|91IeWoF|CFc#?;E$
zM+Dsv0o=vMPakUkWjMZ0q5)_jEDUwn(1dxp?5*-Ftbs0dMv2Rwhwag3Y3(SFVrQ7z
zO!Ma3#7L7)D{0?3cI{?*x+z&7EG69aLmbAkwM5z!9P7q%yun+yAJ>92;`aueY1`z2
zGfjELnH-$i3WGDdAcHf(nG~GSes92;bjz81$(fpKuQ=1N5S+PD24|)ygEMd4f-~ax
zf1I)SSaGJ~gO1jmF|Wh6oZ;7DH=Jp~UT}sHbLLDA&ID(sD1$R^-GVdX_jAsm5iU5x
zIsC|(>UhN&qCs#bIAestnc&Pvx8FjXcDz=)<Z?UDCbe=`Q^K|Q;E0k53N1c386XZp
z)itm2(X(Z?js_ns6+oJ@_>2z)q;WI`AB0v1AIai_9Y!Ti_>l3;mIFQ#8d49gBR-ao
z)#78BAOjzPkA0wlk7)O8k-27Fn&`1{)buzg)0uT6J<c(nM`enSjZo8Ln;J)Y04}$n
zDL(MB_{f&&dNgzZnNyxGm6K4B36-0UQq6RoD7x8GqQ2>&^=kTE%jEU0%KffPzEbER
z^X(UWD&wZa>)2NcJ=oBHJenTsha-^(JwCq0do%ItTl?GZ&8#qf*DOkWjo$$XkPh$7
z)Y(JfGb_)+L*X+jw}p?$4~383nuiKWAa^Q!I@hA`d6D)7N!=VsTx}&~00000NkvXX
Hu0mjfPNQ>3

literal 0
HcmV?d00001