From 418cab092c136a6feba6d01d9689116068686193 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Wed, 24 Jun 2020 23:32:44 -0400 Subject: [PATCH] Fixed old graphics info collisions. --- .../pics/pokemon/azumarill_old.png | Bin 0 -> 325 bytes .../pics/pokemon/azurill_old.png | Bin 0 -> 308 bytes .../object_events/pics/pokemon/deoxys_old.png | Bin 0 -> 547 bytes .../pics/pokemon/dusclops_old.png | Bin 0 -> 640 bytes .../pics/pokemon/groudon_old.png | Bin 0 -> 1052 bytes .../object_events/pics/pokemon/ho_oh_old.png | Bin 0 -> 529 bytes .../pics/pokemon/kecleon_old.png | Bin 0 -> 345 bytes .../object_events/pics/pokemon/kirlia_old.png | Bin 0 -> 469 bytes .../object_events/pics/pokemon/kyogre_old.png | Bin 0 -> 1037 bytes .../object_events/pics/pokemon/lugia_old.png | Bin 0 -> 410 bytes .../object_events/pics/pokemon/mew_old.png | Bin 0 -> 801 bytes .../pics/pokemon/pikachu_old.png | Bin 0 -> 335 bytes .../pics/pokemon/poochyena_old.png | Bin 0 -> 674 bytes .../object_events/pics/pokemon/skitty_old.png | Bin 0 -> 332 bytes .../pics/pokemon/wingull_old.png | Bin 0 -> 354 bytes .../pics/pokemon/zigzagoon_old.png | Bin 0 -> 299 bytes spritesheet_rules.mk | 32 +-- .../object_events/object_event_graphics.h | 17 ++ .../object_event_graphics_info.h | 30 +- .../object_events/object_event_pic_tables.h | 264 ++++++++++++++---- 20 files changed, 264 insertions(+), 79 deletions(-) create mode 100644 graphics/object_events/pics/pokemon/azumarill_old.png create mode 100644 graphics/object_events/pics/pokemon/azurill_old.png create mode 100644 graphics/object_events/pics/pokemon/deoxys_old.png create mode 100644 graphics/object_events/pics/pokemon/dusclops_old.png create mode 100644 graphics/object_events/pics/pokemon/groudon_old.png create mode 100644 graphics/object_events/pics/pokemon/ho_oh_old.png create mode 100644 graphics/object_events/pics/pokemon/kecleon_old.png create mode 100644 graphics/object_events/pics/pokemon/kirlia_old.png create mode 100644 graphics/object_events/pics/pokemon/kyogre_old.png create mode 100644 graphics/object_events/pics/pokemon/lugia_old.png create mode 100644 graphics/object_events/pics/pokemon/mew_old.png create mode 100644 graphics/object_events/pics/pokemon/pikachu_old.png create mode 100644 graphics/object_events/pics/pokemon/poochyena_old.png create mode 100644 graphics/object_events/pics/pokemon/skitty_old.png create mode 100644 graphics/object_events/pics/pokemon/wingull_old.png create mode 100644 graphics/object_events/pics/pokemon/zigzagoon_old.png diff --git a/graphics/object_events/pics/pokemon/azumarill_old.png b/graphics/object_events/pics/pokemon/azumarill_old.png new file mode 100644 index 0000000000000000000000000000000000000000..84b07ea5bc12f6d737863afce821b11e24ec3c9d GIT binary patch literal 325 zcmV-L0lNN)P)2Xkl{Dhv6g#o0( zzkuL31S}A8JVSG5#6q&qteTj_dLP;iMEiO1=vQ9=sW60N2v>9jALQ~=F z?zI6U`T{1D_>I0p^FpqTY*en{^d{0v5KiQxxL}>xJ6GNoqQNyJF6n;JH+W#$1;V!P z&!@6~aX)@+?PZLjzaV2AhjJTZxnFE=(X&P8!$?9^X$hBB-UJ~5Bk0^3>K`=$=jZba X4+5IQX@&Zy00000NkvXXu0mjfFTRbR literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/azurill_old.png b/graphics/object_events/pics/pokemon/azurill_old.png new file mode 100644 index 0000000000000000000000000000000000000000..99cd25fe5c772963d5a6a530a5f5e492c0c3e748 GIT binary patch literal 308 zcmV-40n7f0P)(>tQc_K#`CSABPTz{t;aJ z6LloVNTRlMdS4>MP)bCT?0O7hzDk(@T@a-b%WOG|Zx@jX3U461LRp%nBs)v16scH< zR}me=DrW${w7tlID^y6S+9T&-u_&Htt7DQjQnt71Y>(Fli0000OV&BaoKdmuqM#f$EgQmg;~000000000=N=pC#{{R30^AuMO00055 zNklsbvFruajd$EC$5WBQn)f6jYLLi!oscF?Fe*jpS_<7yf zfwmyA5Mnzm^dqp~#k#xqIiK$ifd4ws`6FK4T2`zAF2>ex05mZ+om>ENZrYy7xswB& z6kSsY(<+y8047}f{L!-n-3$OoQo)^P5oa?10B3LKcNdiB0MhmO@$md@t^iVS{P8gT z@y!(gp!oFW{u=T;07b*yAb4eT?ur%g9UlaJ+??T^K_-a13gB_5?P$B}mN70`S9KlV z>nfmB^R-}PgmB+-D|J?r2)YbH4IFh;3M7meu*MSwtTsd;KrJ6AfYWFwA4M%J`m@Gu zvjh(ZX^v6L4>KU@mz1C-`U&UBmJ=xfHvAI}M8j&DqRBCfVAI*->YaK3f1Nn64#=PGFJ->J4i*A!+wAZP#p002ovPDHLkV1mBg=a2vZ literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/dusclops_old.png b/graphics/object_events/pics/pokemon/dusclops_old.png new file mode 100644 index 0000000000000000000000000000000000000000..fb2c85576c08e846addb2496d030ea8ebbd05d3e GIT binary patch literal 640 zcmV-`0)PF9P)x_HVh9i*)pMkzL32_dLDkjOi;I*&K~n$!{{R30E*dwM0006D zNklr;|^1v;n)FYu3NB>)xb+fyre1v;n)TcQC(H1OIe8~d`cJDXl9-Z=L(qb-&y;vu{D}Di zR7g&!CBK3#jTiA*By&(H5DxqtXtaR~P#_8?)PpUJ57{|vjzt@7(YnRwu#Ud;lw2SV zC)9&2(MZ3}(#Sb9!i41QhDNsn6liKtYXopw3uxU$ny8CR2gHcN=^!%&a&!D*lN6vp zlExzfV!bs2ctnE<1&u#q$sy@V(mrgsfR`N;Si-hjR4bqmdXC58oQn&tD?8By+yX$X zWGQLI310Y6aUO{Yk4|{XD1fE2CcYiL^$q`fUi2d%!&E@ynMztM^LcD(jN|e{^$O?@ zO*7-^hV%MJ8&t&3;3|lvmo&P$zRxW?SO3+{k)Ff#UXKw{3wc#&Cg;pwhOKSR-Tv6z ayT1Wy{ literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/groudon_old.png b/graphics/object_events/pics/pokemon/groudon_old.png new file mode 100644 index 0000000000000000000000000000000000000000..3d14c5ac9ef670f03bcf7a4b73a74ba7ffb70a48 GIT binary patch literal 1052 zcmV+%1mpXOP)!OFtG1lB4ce5V+-xBe5VL zRvuN>dFCcjAu$^)slT>zhe|(j@!`Ynf((K#!jgm2IOFRV7yM6fm}O!48@{faDf7j= zL)4sQb@>}^X@f2{|LLg4G%L!>9HLD((?TB}UvLy+nx+|EW}@1rSg3sebmyo%6(C7S z`7$%6H2}r&_}o!`q7Y)1W@iqL9Fp_{fN^5Z9mU7>0ZEk%sl3FYBmh8BP4xKO(cV%J zTvcG&fsdR9(Wsk(ulTT+BCw(7dmvFWoN1 z{L%A=Dl5A?h5x?G@0Qpn>>N2VI_@_uv_OxPrH@1wcOJh9ew~e&wOM*P`p;k zV3WiTT9tc8xJlGjYtF=RvO(tIXgFdnHkojJ^&vA$+6NszB2JKJEA$_Yxsj1hCMnN{ zUcdtO6=8Rb2gY7Nws8#*r>J~FH$IJqVghnL^7`Nt0bGnDJ{4H(-g~VE1-47*;#y`= z!`csD6v^!U@Chy9A{xKue*JB(ax&uH7HY@mubqd0OjJf$-;N5$pwmhr|DFe2F`;R!;Ktlj^)nzwj5! Wi3Dpb31zwf0000JuqQoTVrV(xQ6tU)v*-0004; zNkl1aKSZ0~k1~9RqGd z;5h;^@`*(bl}%6PdB3DR%;=HPX`&}{fUAy@D8%zXB8TqAmx9q>haNOTff67wg}8Tz z77l`epCJ&ZgxD6PB(Hktp7y}DVE(xN=^>VNsGvj;Cznwb_C13Vf4)~0XjY7DYb0{o zqO!rjwmj^YltlqON&=i{3->(~&T8S9bdCWf9`;m)M76t-LVsNi0fV#P>DuGWS3qaK zmBM)6Q2??9XFHC*UPNsxg|VwveSZMHt`5M9-nCno!cesU?GZcAWpDWCMDJ46r7#qV zZ*m+^l0vppKjNlHQj!#AI98&T;$z#|vVp6Q2ZamU`j|w=*&@4=E5O49d;b>!3`IHX7@piL8MGump0dzNr)Dt;4??|&L=TW7#66CCfs*pzE)@to ziu@Em1OVFNpkcpvYH`rBljAeh+@B6w9a8}ay%$n33L7CzJ>uXK-8A}a#kUX4#?;}h zcw<96TSIO{7lwdo8+`zlZ5q#(30+xQd}zD literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/kirlia_old.png b/graphics/object_events/pics/pokemon/kirlia_old.png new file mode 100644 index 0000000000000000000000000000000000000000..bac74a9ccb0c3ddca0031d49393edf4b97cd3f92 GIT binary patch literal 469 zcmV;`0V@89P)_3iGUR1;0Csr4{D?gSU0GQQ1>l`CIV83g8>FReAFX)Ws#0G zLQjv@Ljg!34hEP88pGCR2(V$RArGVw2LntW+~(^6#16Vou4pI$Qiy}TG_X4TL^qV@ z9cs3sFGc`|IOq#mp7--MwMjjsi?e1M5+H>*=nK$mUmthl_WIozU=RmGA+z=_uCP0R z6aQYtU?@F_tfm4=tN<+2e&37IR$teHU;Y!KLHfDU`g;^rjl2H>AOolhChTD500000 LNkvXXu0mjfBc{lN literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/kyogre_old.png b/graphics/object_events/pics/pokemon/kyogre_old.png new file mode 100644 index 0000000000000000000000000000000000000000..32f67aafa2c7399296e29c63dc751fd8fd4dc7f4 GIT binary patch literal 1037 zcmV+o1oHcdP)x_HVh9i*)pMkzL32_dLDkjOi;I*&K~n$!{{R30E*dwM000A+ zNkl>O2!%tDgNCia#P&&Y%Ex=E#VFnrJa+h=fkiYuCn+y!lo+?SJK+1r2&=~`;Ghjxq(ee=h z1?`e2OhH0~SV9GJ&T%&A#gG7HHS^&H5YejzBv@96GQ!XS2EBN)XEGpQvFsCqRinUm z)6}4%C_PdKXnUOz;O>c`N+3#2^6ERwxNbn%G6e=JdnlONLl4?s^AS9*NQS6Fl^e`| z`$&43Hk4Ecu=@%JK&Ks`+cX=Z!pjecn6H!AkPfA-?6g}1=dN#Nz2+lWBD$2_iiLlu zYs`1J#Cuwz19WSIJ)qYNNIB*8C!iHuauojY?X;#O4BpezrcAy22habh@7x=m^K3j~ zMgZ%`_tS#~5L&sr5NVs^cTu{#5H(K6tZm9PQe*(7>>rN@iBuz;%gWvbF`qcYda7B+ zi(b!~!m}w$24IcScINRwZGzQqPUlO3Qb&_dZ1{U!3Mxz43_2#wDVMd8lyj9J=a`vF z5NzKjd>2NbqlD`UufkHmX#~xnV>ofjdjSHgJgvIIFA@y~3q@rtyphmRU$#={(QT;rruEv}a)UbIeUvnIasrpp?Hk?55miylCm z@+u4XqD^I&M45`$*UOit?R6HvW`LLKS_`UR(D$woF2G0f@Fy6$PBcHAr|`?e!(Y(S zb>i#4$l${RFGxEOp(*&Mp$C8q(70>`${klauTY<_mu-ylch+wzY|d8)pkAnL3ElOh zfHs-yKhy0D?DFMR_|HAvzh@J9hu3B$DegSPIQ>st3u;^Sr_lA+3Ih>rfF1)YXQ?FO6UR%KC=l$jeFxgY6QzM$C zjz{I*{;g@}{wCkc!B2lWlijg;LL`Usyk|7}#qIb0xC8zJ0efB}kMMV<00000NkvXX Hu0mjf-?r%o literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/lugia_old.png b/graphics/object_events/pics/pokemon/lugia_old.png new file mode 100644 index 0000000000000000000000000000000000000000..1dfc6858b90f830a7433edd0333e1d548ce231e0 GIT binary patch literal 410 zcmV;L0cHM)P)N?QN_{{R30pUU_40003c zNklo&!yBvaJXt+lm<0mE#ZF2&L}S31dH&|J)-mNoSTcG*Q879`dX$3?JY*#?i0(1xiA4Uhi0Qy&p#Y~mHBE*7d zxs-Hn6wxqZ96PF(t)%6}nusFCnP_{z;gYUg_MjTR7Kam(wo6x5&f0lvI{d0{8rbO77JtKs3g@3E+V*V*oFJu0D-%TWPINfX}njbu+m7 zAXQl(2InDtV~cv443=DH0GTKU0;NaMb3V4C;;{J#@PTZsS9pC11Y%I}P78QzhTqOwHk-ZN%FxWKQmYNqcG z8S8oJ!kFhh&)Xmg3)FJ$lKw{Zg%ZyI8kcLVby?8chAVnlpvt94x}o|UU(GGRRC?}0 z&&{LLje1W*#?aV^6h;vTn>@1xpi)Z z{OX3!Xg_R%E(7Uwb}9rxXK4WiDU<8#N)ou9bQRxiZ9N6;!Z@zCfDJ+5fK}gu;F+-C zX{689zyjC3=PMQ?mG^v1Xu(^g?s6j-FenKWByBmj-5LaQJyIv=bG46tHo`c%E)xjw zpqE8o18DSduE(bYl(jC0;AbO@V}FeTcEbP*w@9}LGKC9sZHhJl;Szo?LicR6+O#l6 z0UQia_jCC=An2_K^BRJN1RTrxF$Ss6bNPZ}ZCW_3D8RNeK;3`+^csMs2=lt0?2tMc zZ(pi5>>e9cJ@ptA1PJ0z)cv>H*A*nx|H!hG@4|H0=zQ=MDJVySCK$MHIpqepmf#V?{Z^fTKqMlFd%_C5wbd- zaWf+bHft(62I3VyHG2~-Bp6*dJ`?X93JvV$&bb=vZhwQD!XROrrptlS9S<=m8rhHp z#{k>5*g1o6o&iH)U}4A%ED%6e&N`8UT33gb?6LCkN7RS;j*M&o;nb}F`BB(SC$bf% zE(79%5X8o0hyr#Jrk&`wofJZf42Y3iBO9WS0D{*sh^pL4GNdsXVu1mvxPthxo%pNg fr**%s$_zgMxIqo;le;3~00000NkvXXu0mjf-EwIE literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/pikachu_old.png b/graphics/object_events/pics/pokemon/pikachu_old.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d15ef1796db2730dd20195815ad1320908a576 GIT binary patch literal 335 zcmV-V0kHmwP)}%LU h(VUL_Tk$vlpdadYey3dYkz)V=002ovPDHLkV1jjXb&}c1jbOMS{IYQlt%Xf*c{u-a(B>VUd8L zyf!%;h6W5bL7;(cfSl2v_eT=V*dBZAvBw^J?D0Rw_^$!z`A&g*g8&rT+$WHRlvmU5 z8GCaDpkJ%oMwB`r00tl$A_3qvV+(3Y0Qj*jXI5NmKm-#91c287xFH27#Aw93EC81) zbgT~re`yd2CJrb-u~=IpJp#ZM;iAp~a03e*jF1SKHXx3u0}5c4hYvM!L;%=S9m>A- zas=R)eEA08uBfsNV!_k_1<-?(O_u{;9D3IcE{-X{Z}nLnp{dG1KpVt@sRIJQ8zrS0 z{D=vF%a=kNe4YX*<(2@$(BvEv!NfrV(0-NjWy%4#btOda*A#$1D>b-{2C@xe!NfrV z(0)HYewlIrj8B`v_Oj;c3~-9Lmqa(68hl$`>z!Opc zV?X`0_^sOj&|9~T00!wZ4Q3hwkZG)SQ$jP`8U#L9-~{nWX}}yod7u=)S`1)10FCoX zcM9cC1iJHj>jul$fLv@1&^eSi;=`!XM2)mo;)dPp*O!mFGc(Tf8Rt&~s6U^>@9T!L zRv`iRlyx@x_p)ve<<-oi`ZXt6H|F#42Q}2iWNS9J3IG5A07*qo IM6N<$f`1AoeEb>!3;?-l@<0^vmPcgqKQbsnhYUqwauT2nl97i5MSkTD(Z;`&WC9o+ zLK{3vCy_S5+X$A*#%G~X7l0*ggj!xVV$pXaT+>V3QvEbBr+RYnQ=n+SaF6kBg1C|2 z)Eu;EbBrfeQca|+wyN5$9d^eL7mZbfBTfv>gdmCu?zyQz8M*YV8~D3N6}_DwoFVLS z#q3}ThqbPC!&!T|v4E?D5*=~=J zZ=n5b@)lE+QdgA!kp?y!<^0R z8{F`4V~&bMfnm79G-9Nflh%Qj--9T(fp*lXW;zjf!!^s8o0N-L6lb_pih;DpH>?rI zY+~QXgjZ$2*n2R{YUb5X6wQ&I1H9dQR+}S~W-i=iFw9UF^U2q18>ssJK(yG?`O7L* z-j5h&y_>20Eh00I7i8wi#$r6IC#!>Lk~zQg3j;C25_4nS$p8QV07*qoM6N<$g0sh? AwEzGB literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/zigzagoon_old.png b/graphics/object_events/pics/pokemon/zigzagoon_old.png new file mode 100644 index 0000000000000000000000000000000000000000..2eaf2403d5f7eed52a53ce9c66333a9201188ab7 GIT binary patch literal 299 zcmV+`0o4A9P)UA`ws)C`3EQd2PUbd7Lrtn)b?ZxTlk%i)*8SV?U&4$v%om^ zB_OGLWY^-}aPPf9j6mLBo`4DQXuz1VV(l;tCMgSNHY@bxJ{I5=q9=+N1LCsquIfp+ zF!orIAXP~iDntV7L?cfNTjx6KcM+n|<~Es-D*IOF8iynYda0ljFJ+(l^irxHI9cFFXQfw2))%DXkXv;kKRE(q+R%c2weaG002ovPDHLkV1nZVe((SQ literal 0 HcmV?d00001 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 5ed754386c..dfda9e6361 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -405,55 +405,55 @@ $(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png -$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azumarill_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azurill_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/deoxys_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/dusclops_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/groudon_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/ho_oh_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kecleon_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kirlia_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kyogre_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/lugia_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/mew_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/pikachu_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/poochyena_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(OBJEVENTGFXDIR)/pokemon/rayquaza_cutscene.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(OBJEVENTGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/skitty_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(OBJEVENTGFXDIR)/pokemon/sudowoodo_tree.4bpp: %.4bpp: %.png @@ -462,10 +462,10 @@ $(OBJEVENTGFXDIR)/pokemon/sudowoodo_tree.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/pokemon/vigoroth_mover.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(OBJEVENTGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/wingull_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(OBJEVENTGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/zigzagoon_old.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(OBJEVENTGFXDIR)/misc/animated_ball.4bpp: %.4bpp: %.png diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 14db20a2b0..7204232bcf 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -767,3 +767,20 @@ const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/object_events/pics/po const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza.4bpp"); const u32 gObjectEventPic_Jirachi[] = INCBIN_U32("graphics/object_events/pics/pokemon/jirachi.4bpp"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp"); + +const u32 gObjectEventPic_DeoxysOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_old.4bpp"); +const u32 gObjectEventPic_MewOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew_old.4bpp"); +const u32 gObjectEventPic_DusclopsOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/dusclops_old.4bpp"); +const u32 gObjectEventPic_KirliaOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/kirlia_old.4bpp"); +const u32 gObjectEventPic_AzurillOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill_old.4bpp"); +const u32 gObjectEventPic_KecleonOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon_old.4bpp"); +const u32 gObjectEventPic_WingullOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/wingull_old.4bpp"); +const u32 gObjectEventPic_AzumarillOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/azumarill_old.4bpp"); +const u32 gObjectEventPic_PikachuOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu_old.4bpp"); +const u32 gObjectEventPic_ZigzagoonOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/zigzagoon_old.4bpp"); +const u32 gObjectEventPic_SkittyOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/skitty_old.4bpp"); +const u32 gObjectEventPic_PoochyenaOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena_old.4bpp"); +const u32 gObjectEventPic_LugiaOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia_old.4bpp"); +const u32 gObjectEventPic_HoOhOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh_old.4bpp"); +const u32 gObjectEventPic_GroudonOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/groudon_old.4bpp"); +const u32 gObjectEventPic_KyogreOld[] = INCBIN_U32("graphics/object_events/pics/pokemon/kyogre_old.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index faf958743a..71cfa2533b 100755 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -97,7 +97,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBo const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, OBJ_EVENT_PAL_TAG_VIGOROTH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_ZIGZAGOON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, OBJ_EVENT_PAL_TAG_POOCHYENA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, OBJ_EVENT_PAL_TAG_POOCHYENA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PoochyenaOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; @@ -204,18 +204,18 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SkittyOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KecleonOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, OBJ_EVENT_PAL_TAG_KYOGRE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, OBJ_EVENT_PAL_TAG_GROUDON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ZigzagoonOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PikachuOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AzumarillOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WingullOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonBridgeShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AzurillOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; @@ -223,14 +223,14 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, OB const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KirliaOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DusclopsOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, OBJ_EVENT_PAL_TAG_DEOXYS, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SudowoodoTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MewOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, OBJ_EVENT_PAL_TAG_DEOXYS, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, OBJ_EVENT_PAL_TAG_BIRTH_ISLAND_STONE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; @@ -241,8 +241,8 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, OB const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, OBJ_EVENT_PAL_TAG_LUGIA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, OBJ_EVENT_PAL_TAG_HO_OH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, OBJ_EVENT_PAL_TAG_LUGIA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LugiaOld, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, OBJ_EVENT_PAL_TAG_HO_OH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOhOld, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AnimatedBall = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_AnimatedBall, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Follower = {0xFFFF, OBJ_EVENT_PAL_TAG_DYNAMIC, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Following, gObjectEventPicTable_Togetic, gDummySpriteAffineAnimTable}; diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 5267e3189e..9218e2ac61 100755 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -1698,51 +1698,51 @@ const struct SpriteFrameImage gObjectEventPicTable_Maxie[] = { }; const struct SpriteFrameImage gObjectEventPicTable_KyogreFront[] = { - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 0), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 0), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 0), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), }; const struct SpriteFrameImage gObjectEventPicTable_GroudonFront[] = { - overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 0), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 0), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 0), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), }; const struct SpriteFrameImage gObjectEventPicTable_KyogreSide[] = { - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), - overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 2), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 2), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 2), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), }; const struct SpriteFrameImage gObjectEventPicTable_GroudonSide[] = { - overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), - overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 2), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 2), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 2), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), }; const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { @@ -5255,20 +5255,20 @@ const struct SpriteFrameImage gObjectEventPicTable_Latios[] = { overworld_frame(gObjectEventPic_Latios, 4, 4, 5), }; const struct SpriteFrameImage gObjectEventPicTable_Kyogre[] = { - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 0), - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 1), - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 2), - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 3), - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 4), - overworld_frame(gObjectEventPic_Kyogre, 8, 8, 5), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 0), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 1), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 2), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 3), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 4), + overworld_frame(gObjectEventPic_KyogreOld, 4, 4, 5), }; const struct SpriteFrameImage gObjectEventPicTable_Groudon[] = { - overworld_frame(gObjectEventPic_Groudon, 8, 8, 0), - overworld_frame(gObjectEventPic_Groudon, 8, 8, 1), - overworld_frame(gObjectEventPic_Groudon, 8, 8, 2), - overworld_frame(gObjectEventPic_Groudon, 8, 8, 3), - overworld_frame(gObjectEventPic_Groudon, 8, 8, 4), - overworld_frame(gObjectEventPic_Groudon, 8, 8, 5), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 0), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 1), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 2), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 3), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 4), + overworld_frame(gObjectEventPic_GroudonOld, 4, 4, 5), }; const struct SpriteFrameImage gObjectEventPicTable_Rayquaza[] = { overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 0), @@ -5295,6 +5295,162 @@ const struct SpriteFrameImage gObjectEventPicTable_Deoxys[] = { overworld_frame(gObjectEventPic_Deoxys, 4, 4, 5), }; +const struct SpriteFrameImage gObjectEventPicTable_DeoxysOld[] = { + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 1), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 1), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), + overworld_frame(gObjectEventPic_DeoxysOld, 4, 4, 0), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MewOld[] = { + overworld_frame(gObjectEventPic_MewOld, 2, 4, 0), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 1), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 2), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 3), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 4), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 5), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 6), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 7), + overworld_frame(gObjectEventPic_MewOld, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DusclopsOld[] = { + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 0), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 1), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 2), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 3), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 4), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 5), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 6), + overworld_frame(gObjectEventPic_DusclopsOld, 2, 4, 7), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillOld[] = { + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 2), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 2), + overworld_frame(gObjectEventPic_AzurillOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonOld[] = { + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 2), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 2), + overworld_frame(gObjectEventPic_KecleonOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WingullOld[] = { + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 0), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 2), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 4), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 1), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 1), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 3), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 3), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 5), + overworld_frame(gObjectEventPic_WingullOld, 2, 2, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzumarillOld[] = { + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 2), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 0), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 1), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 2), + overworld_frame(gObjectEventPic_AzumarillOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuOld[] = { + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 0), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 1), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 2), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 0), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 0), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 1), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 1), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 2), + overworld_frame(gObjectEventPic_PikachuOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagoonOld[] = { + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 2), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 0), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 1), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 2), + overworld_frame(gObjectEventPic_ZigzagoonOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyOld[] = { + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 0), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 1), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 2), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 0), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 0), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 1), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 1), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 2), + overworld_frame(gObjectEventPic_SkittyOld, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PoochyenaOld[] = { + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 1), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 2), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 3), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 4), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 5), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 6), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 7), + overworld_frame(gObjectEventPic_PoochyenaOld, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LugiaOld[] = { + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 1), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 1), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 0), + overworld_frame(gObjectEventPic_LugiaOld, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HoOhOld[] = { + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOhOld, 4, 4, 1), +}; + const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = { overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0), overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1), @@ -5307,6 +5463,18 @@ const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = { overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 8), }; +const struct SpriteFrameImage gObjectEventPicTable_KirliaOld[] = { + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 0), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 1), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 2), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 3), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 4), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 5), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 6), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 7), + overworld_frame(gObjectEventPic_KirliaOld, 2, 4, 8), +}; + const struct SpriteFrameImage gObjectEventPicTable_RubySapphireMay[] = { overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 0), overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 1),