From 6816e6bd8eed60f75dc0c357edd3a2eb3a7b11a4 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 19 Jul 2024 17:02:36 +0100 Subject: [PATCH] Nuuk sprites 2 Adds sprites for Electivire, Magmortar, Honchkrow, Porygon-Z and Wyrdeer! Had to rearrange some things in both main.asm and layout.link but hopefully it won't break anything... --- README.md | 2 +- gfx/pokemon/electivire/anim.asm | 12 +++++++++++- gfx/pokemon/electivire/anim_idle.asm | 5 +++++ gfx/pokemon/electivire/back.png | Bin 304 -> 412 bytes gfx/pokemon/electivire/front.png | Bin 315 -> 1364 bytes gfx/pokemon/electivire/shiny.pal | 6 ++++-- gfx/pokemon/honchkrow/anim.asm | 8 +++++++- gfx/pokemon/honchkrow/anim_idle.asm | 1 + gfx/pokemon/honchkrow/back.png | Bin 304 -> 384 bytes gfx/pokemon/honchkrow/front.png | Bin 315 -> 1031 bytes gfx/pokemon/honchkrow/shiny.pal | 6 ++++-- gfx/pokemon/magmortar/anim.asm | 8 +++++++- gfx/pokemon/magmortar/anim_idle.asm | 5 +++++ gfx/pokemon/magmortar/back.png | Bin 304 -> 510 bytes gfx/pokemon/magmortar/front.png | Bin 315 -> 1306 bytes gfx/pokemon/magmortar/shiny.pal | 6 ++++-- gfx/pokemon/porygon_z/anim.asm | 13 ++++++++++++- gfx/pokemon/porygon_z/anim_idle.asm | 1 + gfx/pokemon/porygon_z/back.png | Bin 304 -> 427 bytes gfx/pokemon/porygon_z/front.png | Bin 315 -> 913 bytes gfx/pokemon/porygon_z/shiny.pal | 7 +++++-- gfx/pokemon/wyrdeer/anim.asm | 10 ++++++++++ gfx/pokemon/wyrdeer/anim_idle.asm | 7 ++++++- gfx/pokemon/wyrdeer/back.png | Bin 304 -> 509 bytes gfx/pokemon/wyrdeer/front.png | Bin 315 -> 1347 bytes gfx/pokemon/wyrdeer/shiny.pal | 7 +++++-- layout.link | 2 +- main.asm | 6 +++--- 28 files changed, 92 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index ed764be..169a839 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Additionally, there have been many wild encounter tweaks. View this document for - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, - Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops - EyeDonutz: Walking Wake -- nuuk: (WIP) Azurill, Farigiraf, Glaceon, Leafeon, Magnezone, Sylveon, Togekiss +- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer - SCMidna: Munchlax - Pokemon October et al: Bellignan, Caretorker, Inoshika, Bipulla, Sonegg, Kolta, Coinpur, Dodaerie, Bundra, Kiwooked, Koalyptus, Trebir - Tom Wang: Gold/Chris running sprite diff --git a/gfx/pokemon/electivire/anim.asm b/gfx/pokemon/electivire/anim.asm index 875f7be..dca674e 100644 --- a/gfx/pokemon/electivire/anim.asm +++ b/gfx/pokemon/electivire/anim.asm @@ -1 +1,11 @@ - endanim \ No newline at end of file + frame 1, 08 + frame 2, 24 + setrepeat 4 + frame 3, 03 + frame 2, 03 + dorepeat 3 + setrepeat 2 + frame 3, 06 + frame 2, 06 + dorepeat 7 + endanim diff --git a/gfx/pokemon/electivire/anim_idle.asm b/gfx/pokemon/electivire/anim_idle.asm index 875f7be..8340921 100644 --- a/gfx/pokemon/electivire/anim_idle.asm +++ b/gfx/pokemon/electivire/anim_idle.asm @@ -1 +1,6 @@ + setrepeat 2 + frame 4, 06 + frame 0, 06 + dorepeat 1 + frame 5, 08 endanim \ No newline at end of file diff --git a/gfx/pokemon/electivire/back.png b/gfx/pokemon/electivire/back.png index c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..f56f8954a70960870def961e9195e43c8842811e 100644 GIT binary patch delta 377 zcmV-<0fzpt0-OVoEPwz1DaM2;0001!K!4x>00B!$L_t(|+U=FwlEWYjL$UP#|J-mh z!Z>OAuy5;`W=ik@S-7;6|M>F&`CGb~5kCN>RN{3$tpV?eD(DF~3Va5Dvq082;FI9E z$CZCWT#IFvbYKO(>g6cR=KN%C09K_deJ}!KKB*)}*i1TI(tl)SW^IT5JleLWc`Cw! zw#;mf9c?Swq1YF#vq%1Jk~tCk#Lo41E+C9ANlCCqNq9oY-`7E(3rRe06NOiU4a z!x>@|<;d*ae!giFsid`uN#(6-ibI@${y9gE()g1=Wx3*UHy1an?)mK0#t`Yiw zhdH2x4y}HyziKtIP%^j;oE|_GMhDIt2_fc1P2>cS5wgQh04X3fD1bbMrfAJ={?POR X#f1ujjM+ai00000NkvXXu0mjfiMh8k delta 269 zcmbQkyn$(gPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{#H*H$B>F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8l)sRVj&{X6h;b4z?28!ws28&ikG68WIIzA%2p zZER!+sh^6Js8E&}CrU-H_YDMvY)A+}ZJBYMVGB!{gp8NJ|Gb6!nP3YDQbF&b36$aG zl-=Q3@2E6Zyy33t0v=34&ctM>sNt9wSTx{FgplMS%+dgKT+%5cH>!}Oc@3mss!CTJ zJ+lS$>Vk4bHjj}m9-=vAEG-+!K&UsSc)bzI47o`_l^u)1E)?&k)s6fWe)+Oa26 zHf0vFLJ5d&&|`?!E%E3kQ;!kl{7geVD-M*8sS;|_YQtCQ!yAPfaAKeq&5euIOFlBT znWyVAld|1|8KVjpaFy8vb;|B2vt0mvMNxOW`GTntaQ|glt+i?)m}0QNYKa0lM%{~4 z)JT~?^eqlmtaWJV;_4orO{B1%5e^}hY=qX&!085XE%UPFMs_9xa0<7>HFGn>d%TY@XyhOaQ4tKhSX_r?uWv`^u6tu z9H-mS{!dw;d~BWGz^T2Mt7dBM)T{G{(~x?pJLw%n9p|$~wx#T(c_b55n^#Tx|()hFwXVg??Nar1^Uea{nWAd)2dHQxj&*sNDtN z{MmDSv^2zea5UE8Jtrirzv<}?XmIs0?`Yx53*M1SdCfbxWM1Sqy5M`+ONE${m47okGw;QcNFg^-ch`xct?HT@$bLyDBe-Lqj*R0 zj^Z7~JBoJ{?OB!chvJ8^?XM?-%-zZ)bkzn zeMf!YQO|c2@A%8S13&T(Jmwv7HsOy-Z+J&ILW_44?~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/electivire/shiny.pal b/gfx/pokemon/electivire/shiny.pal index 5c88669..e932aa4 100644 --- a/gfx/pokemon/electivire/shiny.pal +++ b/gfx/pokemon/electivire/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 25, 00 + RGB 18, 20, 00 + diff --git a/gfx/pokemon/honchkrow/anim.asm b/gfx/pokemon/honchkrow/anim.asm index 875f7be..2b95022 100644 --- a/gfx/pokemon/honchkrow/anim.asm +++ b/gfx/pokemon/honchkrow/anim.asm @@ -1 +1,7 @@ - endanim \ No newline at end of file + frame 0, 04 + frame 1, 52 + setrepeat 2 + frame 2, 08 + frame 3, 08 + dorepeat 3 + endanim diff --git a/gfx/pokemon/honchkrow/anim_idle.asm b/gfx/pokemon/honchkrow/anim_idle.asm index 875f7be..64f3f38 100644 --- a/gfx/pokemon/honchkrow/anim_idle.asm +++ b/gfx/pokemon/honchkrow/anim_idle.asm @@ -1 +1,2 @@ + frame 4, 16 endanim \ No newline at end of file diff --git a/gfx/pokemon/honchkrow/back.png b/gfx/pokemon/honchkrow/back.png index c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..41996e82a203bb995bab1f30dd9712303667939a 100644 GIT binary patch delta 349 zcmV-j0iyn}0)PXMEPwa45II7e000051M5Qo00A#aL_t(|+U=Cl8p0q5MuGqR-?>yo zATf8-Rqm^nJ4bM$ME~~F2H+715xFxuiT5||jK&YRUAPzKbsaz>;9*9kVf{nUtWJWy zkie@kTh7GZeu`jS!NKg3jo~F-S%E=YemR!L?D0l!D@4enYxa8yzSB)WZ=IaU)q?&mN{xe4!^#fQ;7FJgi>uxLiC zBkE-=9F6(3^^Q}c-`QHV0h&W%dmP+JzdZ52~_C~#8@7rNlp z@R3E1JVp8#KvwxR*Ad_g|6x=C`r;`c3>0Ufu0Cf$YFtl~WZ;a?ia7{8>eX+JqoDO2 v_q8)p>8u?Qx1JXyZ`SRJQyoaLlmz(&{|ACx4Yx`lf2*g9V@SoVqgMj?nhkiE zFRa-2f3EsM$AuPUMlIL$HR^a-GLBR;zj$`>?Bdz(=Ks|W$es}OsGILBDbpk&F(Hmi zF<{s2mX70#owhX#@`_C~KP3ELR-$0u=ATP+IX!kW)qjqvW81g(^piS^Z4VEs)~Ry! zII?Jew4Lb~og_A+{XC=S3&s;QD=b(QADPIvJ{43=_|L(*?Ru71N50ro#rG@2AO7R% zju2&E6|NG0Pi^zs_xl&@zA68Jxy^^~nZL(bTc8j4QX@Rme0>?TfNTyR27yb#lR=cH ME1RFoI;Vst08a2}xc~qF diff --git a/gfx/pokemon/honchkrow/front.png b/gfx/pokemon/honchkrow/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..d61af4f24deacdfc63d8e0e2db8c8974fd9ccce6 100644 GIT binary patch literal 1031 zcmV+i1o-=jP)3aW zUU;QZ9=nrUCBd6TGB(q6iF%h3(O^-YsSr7ck^4L&t27qtYY@X%E37VEk2DIyMb=}i zx$@yv=A<*3Xp(c#k+Dbd%joLlhUl9?VY&$GwAC%tiNb~TRZ&`A))=Ho!jbi&SvtKz znhmzv1VB#1nhCQGGy%$-;vJEDpY}Q^1%z@ilWr-L0C4&@j9r9vh3b?=7Jep)+xVJN z4zYNu%$ZFTa;RqG&?&UpW+EIzY)4VXnjX+bKMg=+A#~k9%ZP|=t<7mFzo^J2u2x|e zeRY}U$uPwt&G9d~@Q9vfUd5;i(`aqAj|ttb&>{27i&y=d?|Tacggqa^7=o4Pd6MgC*Tb`O69Y&oB!q zZ)xj*K{tIVSIIN2ZsI`mzp^l+t}#~v&6^Gj0dbJ=t`%h|m0hCb+}rhZQ3ti6r5Zuo z=2y0=+9b+RVp&pGgsQ#~u1>DC+ov zJ6KmALfZLHxkD#jlIV~-RF{M|+>v910C(KMO*eMV9bKn=!5wwQH?r8AgjXTD%{xa?W=MLu%znnXqJDfY5J0{#APoKD>BFiOr#AfB<^A6>X z{PBZ)0CC41qSJTwFSsLhQFzZC8Oa{FBlQdS+=0#=&K=Gj&K=Gj&K=Gj&K=Gj&K~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/honchkrow/shiny.pal b/gfx/pokemon/honchkrow/shiny.pal index 5c88669..b576e76 100644 --- a/gfx/pokemon/honchkrow/shiny.pal +++ b/gfx/pokemon/honchkrow/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 29, 30, 03 + RGB 21, 05, 19 + diff --git a/gfx/pokemon/magmortar/anim.asm b/gfx/pokemon/magmortar/anim.asm index 875f7be..6cdba32 100644 --- a/gfx/pokemon/magmortar/anim.asm +++ b/gfx/pokemon/magmortar/anim.asm @@ -1 +1,7 @@ - endanim \ No newline at end of file + frame 0, 04 + frame 1, 08 + setrepeat 4 + frame 2, 06 + frame 3, 06 + dorepeat 3 + endanim diff --git a/gfx/pokemon/magmortar/anim_idle.asm b/gfx/pokemon/magmortar/anim_idle.asm index 875f7be..8340921 100644 --- a/gfx/pokemon/magmortar/anim_idle.asm +++ b/gfx/pokemon/magmortar/anim_idle.asm @@ -1 +1,6 @@ + setrepeat 2 + frame 4, 06 + frame 0, 06 + dorepeat 1 + frame 5, 08 endanim \ No newline at end of file diff --git a/gfx/pokemon/magmortar/back.png b/gfx/pokemon/magmortar/back.png index c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..3defc4fa5aeb7edace66a894bbb4ce76057ae22b 100644 GIT binary patch delta 476 zcmV<20VDpf0{#P#EPwx{0KGXe0000HoT7FB00FH@L_t(|+Le_FlEokhM1{Wpok!V4 zGs(C9l2rN$LTkoogL(Wkc;Ghx@)=m;ODvG8iRA8`0Z%0n@%$>oZ-7Wy38C;xu;@9E z4@4R7z*=cT@Tk0nm;|0WfZ1l80ORTa>Da74PC!DSl?%p9B7Y`Eu0rH|0aoWsheSz` zErfW1Bm~3sC73OQyCr1B)azXGkw47o$8l-xWK|5{;hGn4XVC74ZgJv(+r2m>R z2S8FB$-%M-!qb};UU8%w4y^eqkOahptEuFbw8?dqpgO$+Yi;H$gakU|A-Y~Goxlu% z1oXNlRE(=Y$bVHBSE{Gd4hJ%gjjwv^pD(dgMeZ!UlpB#XM+Mg1ib+iT25_{Y>l=_E z{5Q?`9k^^)czxj8Ecgqs%kXrqv$T5uOg?Ow0PVi(iSMt9efu&xAXPhl1919|>nT|PJp=v&^t8YQ zXuh*Q73IE@_b~W5L;^7e&YEnm#3$fdCO^MA&~^$c(De>r&k3H9`PUDrdHDy%jSh-v SV+L{n0000F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8C>TiGw5uHf637S!pU01iyEAOOn`)SRnn662OJH@r` z?=K^T&|bZcnB|s*gRXQX$X|S2-XuyeS?^!N$ExhDnc4j<;SEBj?(!wK)@+vvYb%OE z7U?BqQ~FDV_4gEZ$`A)a(i$Yk?GbOn>}dar}xm9U<)Al!xO!d)reR$Xh; z0vJ0hx*%-xMp}ukc84ekQ7mW(^M*$&Q=-mo?QgTc5{{3D2}tOnR~@KXSZ5B+LnkK7 z&|dF`NnI5%2ghiLNfIC1RGWnC!q;v~)}Wb`ezr9>3;U3vc0#n!z_vG{lCMW6d(;4@ zgmYDVz%Z!Mfkj(y+rpq9nyX;f1B+_UVMNw!2;o*WCWGei_+H{_!^f7Z;`qx7^Vvd$ zSY6)UxT#a}M%trMrv=5HXfT-9Ml}IQEQgYP5Y+1^qmi$ix9nohqr<~fo$XcF2d)Or z>td8+q{oUu^_ML&9Fu8SX(ps$yw44UjCd2a@TjmSexDW>21)NO+nBlPC-LYZh1`m+ zv~jF1j0B8%*D)8M0hICRlgwug>I1tKPWdDV*$FiUP@xTe%yAf7Bd>+Fj4>xTTJ2Zh zA(Yesf9q+VGH++0Dk&&&+Zh)^@ph}@9wpTw2&3{Y9P{xKdR_JPR5uB+?O@Q6JJ|Jw zHs8U`IvGOUwA?N}<)g`%OF!X!WDdB@8M0SMTJG!yJ2Qp(6B@gBmcb<>FXN&ckhF1G z#~oA1+i|)OK6i-FQ>|?<`l0u#EQNY(Z6CKpz`Q*^W4HrL9xg)tFxg)vbm$^f7_XBtMK7@@G8}4w&+_(vN^LOrWN8Jf@ zEWdYTnNGuZVClTlh2+u1?a|?W!%-Lm8KykgFbBDKz;IVBI*mlx@9Z z$sPTB3d$4i7|Jj8j?$5!CY=xUj$TF3!8@;ags=ERy(64OKGi#>u%FjEIQIO!-a!lD zQN6>NbcK?GdPf}F5A}{7scYwV^4(miXKbm_F+`$t)D0rZ+mo0Zp^k9DKoOs|4DmMx+7J1{28wD74eB=&K zEYIArQ~n}%@XF*@?uh>r@R2)iBXGhUZDJ;OBzGitBzGitBzGitBzGitWW6Kn9a-@nZI#|%d%g&qt^=Zx$=CjJh>yeBe^5FBe^5F<8O1vA3C&jk!EUY QRsaA107*qoM6N<$f+t&wh5!Hn literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rA2RvOILn>~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/magmortar/shiny.pal b/gfx/pokemon/magmortar/shiny.pal index 5c88669..0ccf2a2 100644 --- a/gfx/pokemon/magmortar/shiny.pal +++ b/gfx/pokemon/magmortar/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 14, 30 + RGB 24, 04, 14 + diff --git a/gfx/pokemon/porygon_z/anim.asm b/gfx/pokemon/porygon_z/anim.asm index 875f7be..79eba45 100644 --- a/gfx/pokemon/porygon_z/anim.asm +++ b/gfx/pokemon/porygon_z/anim.asm @@ -1 +1,12 @@ - endanim \ No newline at end of file + frame 1, 16 + frame 2, 06 + frame 0, 06 + frame 2, 06 + setrepeat 3 + frame 3, 04 + frame 0, 04 + dorepeat 5 + frame 3, 06 + frame 0, 06 + frame 3, 06 + endanim diff --git a/gfx/pokemon/porygon_z/anim_idle.asm b/gfx/pokemon/porygon_z/anim_idle.asm index 875f7be..7cefe8a 100644 --- a/gfx/pokemon/porygon_z/anim_idle.asm +++ b/gfx/pokemon/porygon_z/anim_idle.asm @@ -1 +1,2 @@ + frame 3, 08 endanim \ No newline at end of file diff --git a/gfx/pokemon/porygon_z/back.png b/gfx/pokemon/porygon_z/back.png index c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..eff2f2711f6ef33d18212cea69a210733480b7d7 100644 GIT binary patch delta 393 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 literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rA2RvOILn>~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/wyrdeer/shiny.pal b/gfx/pokemon/wyrdeer/shiny.pal index 5c88669..63f19d4 100644 --- a/gfx/pokemon/wyrdeer/shiny.pal +++ b/gfx/pokemon/wyrdeer/shiny.pal @@ -1,2 +1,5 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 13, 22, 07 + RGB 12, 01, 04 + + diff --git a/layout.link b/layout.link index ad649eb..60cdaf1 100644 --- a/layout.link +++ b/layout.link @@ -152,7 +152,6 @@ ROMX $34 ROMX $35 "Pic Animations 2" ROMX $36 - "Font Inversed" "Pic Animations 3" ROMX $37 "Tileset Data 6" @@ -176,6 +175,7 @@ ROMX $3e ROMX $3f "bank3F" ROMX $40 + "Font Inversed" "mobile40" ROMX $41 "bank41" diff --git a/main.asm b/main.asm index f952487..c778218 100644 --- a/main.asm +++ b/main.asm @@ -440,14 +440,14 @@ INCLUDE "gfx/pokemon/bitmasks.asm" INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm" INCLUDE "gfx/pokemon/unown_bitmasks.asm" INCLUDE "gfx/pokemon/frame_pointers.asm" -INCLUDE "gfx/pokemon/kanto_frames.asm" +INCLUDE "gfx/pokemon/unown_frame_pointers.asm" +INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "Pic Animations 3", ROMX +INCLUDE "gfx/pokemon/kanto_frames.asm" INCLUDE "gfx/pokemon/johto_frames.asm" -INCLUDE "gfx/pokemon/unown_frame_pointers.asm" -INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX