From 143a6a6417c44885d5f9da5b4152b614ae21210a Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 6 Jan 2024 22:22:05 +0000 Subject: [PATCH] Sprite finale! --- README.md | 4 ++-- gfx/pokemon/front/porygon.png | Bin 1131 -> 733 bytes gfx/pokemon/front/raichua.png | Bin 1177 -> 791 bytes gfx/pokemon/front/slowbrog.png | Bin 863 -> 917 bytes gfx/pokemon/front/slowkingg.png | Bin 782 -> 937 bytes gfx/pokemon/front/zapdosg.png | Bin 842 -> 979 bytes main.asm | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 18893fab..75297b3a 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ and more! Known Bugs ==== -- The highest AI level seems to prioritise offensive moves a bit too much? +- Itemfinder fails at its one job of finding items. Evolution Methods for new Pokemon ==== @@ -400,7 +400,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G (back), Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G -Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Slowking-G, Slowbro-G, Sylveon (front, with help from Albatross) +Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Slowking-G (front), Slowbro-G (front, with help from Albatross), Sylveon (front, with help from Albatross) Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Gorillaimo, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 993fd202e5c92b6e4163e5bfede8dcbe56bcd132..68e764309c365ae1e0d42d1151c731ec2b94bc09 100644 GIT binary patch delta 547 zcmaFOahFxGGr-TCmrII^fq{Y7)59eQNNa#F6OdqdtomPIqN2VrQ!y7ZPSw+f3*T7KMz%0bb(8|Qj z%GgNTz`)ADz$Z~8bK*g9KkTx$Hfyc|jngP`jVMV;EJ?L0$;?eHE=kNSU@$T;!mcMv zvzKeK8e>L1qot>dV~E7%+>0B%4hM*^J+Qx}bq$N^G_@@%1}-Jx9i209d~+{CjHPn%eI8coqNW|x=ngMZx7sI ziZ3dNecJ11r`M6$EZ^w%x>JLF{lTvqBK|)m*Ir%kWWTy+Z+BcS|IaC_mmif|Q2A3} zs=1QG;|(HF(TWRdC%@nJBhXgjmk!_NX-^o7g+DHua+K95bnn!zONKrLaW!YN53;r^ zO)GvK{=?dD|NE2VTHYPN&}Z;;^>bP0l+XkK D_UYE< delta 948 zcmcc1`kF(rGr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqPbQBmKRv%n*=n1O-s2naJy z)#j51N-`yRySp$j8@Cj70D0^sp1!W^&v{t+<;}er3RovLt4JB^8XD;un1&ddS{WN! znVM=F7+4t?Y}yvuHSwUhA9mTpuiu&hjngP`jVMV;EJ?L0$;?eHE=kNSU@$T;!mek^ zzcVi}uf)~W8ADSdpN zr_<@5*^j>*`&0EL|Mc+#tA9#Vn94JUuDkyFWsTkP-i@Jr<_Zs|pMH8oT|K);aPyIA z4-Cu_|)!U%m+!Ccm7ew0CNvTw3+&^)Zn=XV%zFDRVel zW!<=QT7~=WiH6#8LCh)>C*0WXW3X-p$N9+0-gLF7V)v4A1+lPxPL~9iT(R>jv$K4k z-wNB!d3cNN$Nh2F3ty#WiND`yr@l>M@xD_R9K!arOD|m85gwoTBmc_w5`p?(@-n>@ z_p0qn=H)*s|GOgX<$Dvgq(rU@t2EfR@VM-|+HfeurmMjCqQu6kvt9Ez<)u&l{`+FL z0taKDN^6x<+6S9e!6##HF(!y7CD{vYxhD9LbwXiBp+I)e6JJS&LwgObn{a+kRuXyt zIci5^*OrBhVSXnUF}%yv;<}Trrm$~fz0&4K3xBI#o4r^|ZpZnSV?TAL1Y6rJ%486X zV%67ss5M2<_s1WxGaq-X>U<`6=@oY;8|V9(4D#iLwkb!Rf9(st&Y+=~W+WJ=QBr&n#{Ou~nlKW1#TIVq?TqHSD;qLD_5r>ms7_VIVp5a~c z#vYxdW3GnJ_G>>Co%QQfMk@0DI4?o4V}(c z*BwpYW#5#4cGk>5>#n8BUnak(W53tf-x&Vc@I#c}a{Gsqi>8IoSb7_n9T+@a{an^L HB{Ts5JZX?m diff --git a/gfx/pokemon/front/raichua.png b/gfx/pokemon/front/raichua.png index e77a2d33484bc7709e0ba817ec7314dccc1c30be..436a84c4873faa1fe7224d712318cf0ce45e20b6 100644 GIT binary patch delta 584 zcmbQqIh}2S1Sb;%5FC%KNuFq^Z_JeB?e4lBSEK+1 z*-JcqUD;nSvWXfC-2EB&X5wTODHB}-LtO*25FEaloaenP3 zd+);zA`Bn2O~qn1%~q1rx*qH+WyR*H03ZIl^=I7pK<0nbscdJ0wLlYKeH==JP(?B(z8RhPFcYx*;F;haVG9v|=e1{MbCESIqA z*=<;#*In}N$d}vEB`tSnxJHN72Syw2*l{gzf|%%u?#(3}8~!W2V0>dL6k56<%y&c0 znruVn#}4@&O3h*W=RH_+b$S)2l&P|3#=7?%A#xhK?hCJ(YPN)Bw$?p$Gx@qln?0V+ z?b#ondXVY1X4D5S)!sa}xBNFO)6v8$~YZt=j~?GZdJeN z@6vmPzd9t{rd*A4N$w=9i@P%C9h{h|*}H<3`+x!Csy{k&okXP0uW7v$^lMSiofeH4-%7(? tp_hI}JvW~gJj>xxRD2R&x4R?W>3&+uv>k=kJiv%!@O1TaS?83{1ONd7?oI#z delta 973 zcmV;;12X)V2AK(v7#Ro#0001}hC3br000DMK}|sb0I`n?{9y%=Aulrta7bBm000ie z000ie0hKEb8vpl2NAnmF85!{ayp%s=r~X7ARTi#KoIFjo+g;eeSLkc zpV5+kYLP*jfn*e+f_oMW$uXE8wdjNiYQcX{z!6b8#yrra8YLMbNDu`SE}DbYGIuF5 zN0MpHErbZxg0Rme`K}>2#$_YKM96cHu&q!MNV~>7&DA~$M?4e59`q$iE;j`(p?NME z6f0JcV7@T)$T<>>l7rA!HAy-ng23^Sf}zhrf~gD8l2eBrj`syHqK&QbOJ>U^^lu z*uOX4lnx@Lvrj;mPzPIbQG|EUJBEPDOE@Q0lV#tYh|>ghIZD>0Q?xB7`sV}zNrDni zVl^a{liw>i?K#*J?07t`o#wa+=Xrl6T#)XmgMdT|+qB&~oUXDV+|FDWl)H(oV+4=E zT(7e?Vn_$muC?wv9q;q>ow=$L!O$YZ8;OT!DxthY`rBb2cnxG~LL8f`=UHkB-5sQ$ zifTyadcCg4@X2q90N*tB%n9B`7(^&$<>2J|&k*jfka4YD9lbG%wMT zoI1rHbFq;>Ub{TKPOYZ0lxPY{!ttV8#6&9CD8=c;b0k00000NkvXXu0mjfSfQn4 diff --git a/gfx/pokemon/front/slowbrog.png b/gfx/pokemon/front/slowbrog.png index 3130a8cc6bbba0363ab38681cbcb489f44e15e6b..4d6a797c90a177bfb251085dcec03796a29c00d3 100644 GIT binary patch delta 678 zcmcc5HkEyX%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf5FHms;j<{^|Z~z$tqGNx(0^2 z24*2fhE^t~R>qdv1_o9J21^5fPndX7+z-3#6&`0Dpm7={t`Q|Ei6yC4C7HRY#U+Wk z1q?<8M%eWk|IyRMF+}5h>*cfA!j2MbA3Ud3aCqp69r0c&K6!7)1IK_l zVk}Fix27#;fA4kns$7*u)v9Rk)7wv)3nEZU4-eTY0}SZQ9Fvxo`F7F5KSE^E)EtTHf6cOXjueaM(S%=)+mRB5jV~ z;m-DoH~S1joYt&AZz@!y@@!RF-VDLKW2I+L%?%K77QFs;)uhGGD$j_;Y4+Uo3>7is z@h`3lS}640r(3?aa@E($vNL%C8TyV=Q#sddY-Y`o(yE;{X~ofpHyWlt5KA#TC_9a9 z<9unshWN{?B+j>f*;>@@>vn``=^^EJg7w}ztR(p=YTA$GgfsmmdHxBdL#-nQdyyi{SQ(ACqkbP0l+XkK^ZGDx delta 621 zcmV-z0+Rie2j2#eBn<>-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp`Vs+<_GiO|K5xt;F30$#!TOLb-LnA3%T^~=Sbt-VfwGeg-Z2_M$5vK z&P@Y#B3`GX@e0vuD*A{!9=b6rxX&@3hQEV&$BH=`VdIhUZpz=69@t`b%D&$K5a(06 zZ4)4WbHb}&unmx|PWY$Of8Gbk@N~r00dlanTBjk0*hWm2Qeu-4d$Jv@-a5$NbBPYI zRuGFH=(23*`55c>(?_p~m*{;ADtmr?%!pm&2SM}I5f5DAZET8h?S=ThL@|88S}^ch zzs3v13vg;3nazfy6UNI~Dk&70A+D|ecc({Me<`-O00000NkvXX Hu0mjfiDMZG diff --git a/gfx/pokemon/front/slowkingg.png b/gfx/pokemon/front/slowkingg.png index dfd85100481c103de877830e24ed6abfdb064e56..5c0bba1b3aa202ec1bf69851be6e3549c29422d7 100644 GIT binary patch delta 699 zcmeBUTgg5_Wul3b>|q85zQc^i^H-!WFfg!}c>21szhGn&)zwhkb#3j$$tqGNx(0^2 z24*2fhE^t~R>qdv1_o9J21^5fPndX7+z-3#6&`0Dpm7={t`Q|Ei6yC4C7HRY#U+Wk z1q?<8MyPsB3?L@Txae6^ZR!Wf37P?`dokc*(m<;BipUh_6WB2Xa6bm&5TlwpSIGzYEQkA z;9a9>e_WlV_C%jus#hAfR+XP~`?NDQi{rLWx}d&%+kWxO`8vC-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpv%fN`z>E>YW9JE-^MtF;*-xJV+nxmov*}TS=ZgZut3-So^fK3;IzA0`jP$tIFU$DwtFDc00000NkvXXu0mjfJr(XE diff --git a/gfx/pokemon/front/zapdosg.png b/gfx/pokemon/front/zapdosg.png index 821e17b194c11a97c436211374b09b04ca0e7614..e942f6e2124b9249ff6e90186d7391dc810432d3 100644 GIT binary patch delta 875 zcmX@bcA0&G%0v^V=)(*Qe1{p2=dVa%U|?V`@$_|Nf5FHmCd_{Fh2I6B5MzFkUkKy* zMdh=A9Muxnh?11Vl2ohYqEsNoU}RuqqHAENYhV^)WMpM%X=PxhZD3$!V8Cs@X2xV* zX7PIL(p6a^DnRoz;O3QN=B5^xB<2=iG144jWH*PMKTuCpYJ_K+uP=iZkj=rs$|%IZ z3}i6^Ap@fn11p%#z~IFw4QAH^g&BevHK2-^7#Ns@5gLGUAm9PSAa!6`KIpp%P?f%? zi(`n!`O?e#^DjGyuz%oQnXKZpa!Q1goYd6b-c1ZsJst&Eg*a&4OiNhmF+nimMUrwt z!$RKuEJ=!r_F47+S*E#ph-w7aFXHh~Sg0hi$cHmRb%Dk8-Nmuzi<#^B ze0;wzdU^6v$MpBFquo#5`IS+;MtBE&qQl z^98O-lW9$C0y)&-J8-;kAPv z9a*!VSLELWOT<%=j#Q?0Dt2<9r+0YQGBVHM-oeIVinGKSb=b z&NSW6A?6~*7gJ{j2K;a=bPG{&FshU^JbLECfj^TDcJE1;rKlEebok&6-+Aq=U3Khj zjv>=;^8LEHyuO2F+q*WF&BCc~PsKjisn}NhEuw8kTNJ0&qULt?&XkO_D4zDJ&%z7W zNveAtc-NyA?0G7$>&%wI&neT&(!a(X_|hFLW}iPHAtzQP{m9a3N1yMz>(&1K{pSC< sruBdH_szH4wBh{2x$pn~4=!VPttYl``I}gEP@3{|^>bP0l)%^o0Q%lk0RR91 delta 714 zcmV;*0yX{92g(MJBn<>-K}|sb0I`n?{9y%=Aw_@0000ie0hKEb8vp7xI$f0<56++E{>Gn_jorE|Jr?nb|jq5^!dcz?up z>GRLy5uI>{-QlO_bZKSP;z#`VSsSFy*GS{GV<@(D=&cOT9QynYAQ$$+$&%vWCD?d; z814FN2Tx%QgZ5<0r<+f+VbqLS=X|wc-=u%!N1y#fBQ$Z3dOK%)blap24ez;aNQP2| z*^R;Q3`u9Oz7$|dl#aS;R{ff%u^#i5EyW*e!!ZWd5n+-CyTcgJT85^mKe49)tH)Ha z*Q?q|;2oN(*!{ClMVP>rA$j_%RqwGYz+5{nc=8Dh^$1u_-;o>a!9rO_BLdmgp-6uP zQKXE9T&n|3Mx;;WXEfs8KCoSVUV0>37YchTu)`( z(6yDXSw(wxAGC4XiHY+eNIxsLI w(`3|%HaapnIx#gXFfckWFk)uL^#A|>07*qoM6N<$f<}T!ga7~l diff --git a/main.asm b/main.asm index 06dd64bf..aa065b11 100644 --- a/main.asm +++ b/main.asm @@ -339,13 +339,13 @@ INCLUDE "engine/items/itemfinder.asm" SECTION "Vending Machine", ROMX INCLUDE "engine/events/vending_machine.asm" +INCLUDE "gfx/fishing.asm" SECTION "Itemfinder 2", ROMX INCLUDE "engine/menus/league_pc.asm" INCLUDE "engine/events/hidden_items.asm" -INCLUDE "gfx/fishing.asm" SECTION "bank1E", ROMX