From 8c88e8a9b751312983cf6ee5e9e9c03ff44bb377 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sun, 3 Jul 2022 17:15:37 +0700 Subject: [PATCH 1/9] Legends Arceus Pokemon 95% Finished --- graphics/pokemon/arcanine/hisuian/icon.png | Bin 0 -> 427 bytes graphics/pokemon/avalugg/hisuian/icon.png | Bin 0 -> 442 bytes graphics/pokemon/basculegion/icon.png | Bin 0 -> 509 bytes graphics/pokemon/basculegion/iconf.png | Bin 0 -> 474 bytes .../pokemon/basculin/white_striped/icon.png | Bin 0 -> 376 bytes graphics/pokemon/braviary/hisuian/icon.png | Bin 0 -> 484 bytes graphics/pokemon/calyrex/icon.png | Bin 0 -> 338 bytes graphics/pokemon/decidueye/hisuian/icon.png | Bin 0 -> 410 bytes graphics/pokemon/dialga/origin/icon.png | Bin 0 -> 475 bytes graphics/pokemon/electrode/hisuian/icon.png | Bin 0 -> 277 bytes graphics/pokemon/enamorus/icon.png | Bin 0 -> 480 bytes graphics/pokemon/enamorus/therian/icon.png | Bin 0 -> 488 bytes graphics/pokemon/goodra/hisuian/icon.png | Bin 0 -> 509 bytes graphics/pokemon/growlithe/hisuian/icon.png | Bin 0 -> 327 bytes graphics/pokemon/kleavor/icon.png | Bin 0 -> 563 bytes graphics/pokemon/lilligant/hisuian/icon.png | Bin 0 -> 414 bytes graphics/pokemon/overqwil/icon.png | Bin 0 -> 514 bytes graphics/pokemon/palkia/origin/icon.png | Bin 0 -> 462 bytes graphics/pokemon/qwilfish/hisuian/icon.png | Bin 0 -> 365 bytes graphics/pokemon/samurott/hisuian/icon.png | Bin 0 -> 503 bytes graphics/pokemon/sliggoo/hisuian/icon.png | Bin 0 -> 392 bytes graphics/pokemon/sneasel/hisuian/icon.png | Bin 0 -> 332 bytes graphics/pokemon/sneasler/icon.png | Bin 0 -> 478 bytes graphics/pokemon/typhlosion/hisuian/icon.png | Bin 0 -> 438 bytes graphics/pokemon/ursaluna/icon.png | Bin 0 -> 420 bytes graphics/pokemon/voltorb/hisuian/icon.png | Bin 0 -> 254 bytes graphics/pokemon/wyrdeer/icon.png | Bin 0 -> 395 bytes graphics/pokemon/zoroark/hisuian/icon.png | Bin 0 -> 634 bytes graphics/pokemon/zorua/hisuian/icon.png | Bin 0 -> 431 bytes include/constants/pokedex.h | 9 +- include/constants/pokemon.h | 3 +- include/constants/species.h | 475 ++++++------ include/graphics.h | 149 +++- sound/cry_tables.inc | 59 +- sound/direct_sound_data.inc | 34 + src/data/graphics/pokemon.h | 149 +++- src/data/pokemon/base_stats.h | 679 ++++++++++++++++++ src/data/pokemon/level_up_learnset_pointers.h | 30 +- src/data/pokemon/level_up_learnsets.h | 304 ++++++++ src/data/pokemon/pokedex_entries.h | 84 +++ src/data/pokemon/pokedex_orders.h | 55 ++ src/data/pokemon/pokedex_text.h | 40 ++ src/data/pokemon/tmhm_learnsets.h | 139 ++++ src/data/pokemon/tutor_learnsets.h | 46 ++ .../pokemon_graphics/back_pic_coordinates.h | 138 +++- src/data/pokemon_graphics/back_pic_table.h | 29 + src/data/pokemon_graphics/front_pic_anims.h | 313 ++++++++ .../pokemon_graphics/front_pic_coordinates.h | 138 +++- src/data/pokemon_graphics/front_pic_table.h | 29 + src/data/pokemon_graphics/palette_table.h | 29 + .../pokemon_graphics/shiny_palette_table.h | 29 + src/data/text/species_names.h | 31 +- src/pokemon.c | 37 +- src/pokemon_icon.c | 58 +- 54 files changed, 2851 insertions(+), 235 deletions(-) create mode 100644 graphics/pokemon/arcanine/hisuian/icon.png create mode 100644 graphics/pokemon/avalugg/hisuian/icon.png create mode 100644 graphics/pokemon/basculegion/icon.png create mode 100644 graphics/pokemon/basculegion/iconf.png create mode 100644 graphics/pokemon/basculin/white_striped/icon.png create mode 100644 graphics/pokemon/braviary/hisuian/icon.png create mode 100644 graphics/pokemon/calyrex/icon.png create mode 100644 graphics/pokemon/decidueye/hisuian/icon.png create mode 100644 graphics/pokemon/dialga/origin/icon.png create mode 100644 graphics/pokemon/electrode/hisuian/icon.png create mode 100644 graphics/pokemon/enamorus/icon.png create mode 100644 graphics/pokemon/enamorus/therian/icon.png create mode 100644 graphics/pokemon/goodra/hisuian/icon.png create mode 100644 graphics/pokemon/growlithe/hisuian/icon.png create mode 100644 graphics/pokemon/kleavor/icon.png create mode 100644 graphics/pokemon/lilligant/hisuian/icon.png create mode 100644 graphics/pokemon/overqwil/icon.png create mode 100644 graphics/pokemon/palkia/origin/icon.png create mode 100644 graphics/pokemon/qwilfish/hisuian/icon.png create mode 100644 graphics/pokemon/samurott/hisuian/icon.png create mode 100644 graphics/pokemon/sliggoo/hisuian/icon.png create mode 100644 graphics/pokemon/sneasel/hisuian/icon.png create mode 100644 graphics/pokemon/sneasler/icon.png create mode 100644 graphics/pokemon/typhlosion/hisuian/icon.png create mode 100644 graphics/pokemon/ursaluna/icon.png create mode 100644 graphics/pokemon/voltorb/hisuian/icon.png create mode 100644 graphics/pokemon/wyrdeer/icon.png create mode 100644 graphics/pokemon/zoroark/hisuian/icon.png create mode 100644 graphics/pokemon/zorua/hisuian/icon.png diff --git a/graphics/pokemon/arcanine/hisuian/icon.png b/graphics/pokemon/arcanine/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9fe90079293688d5d5bee71af6163306350da936 GIT binary patch literal 427 zcmV;c0aX5pP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vpbm$&Gi&M$o z94Uj@>Su*Y_6Ek4>J5s)BvQ9Zm9q2}j*p)ccl-$bRp5P@Gq5RJUNTrBz^vRQn9;as znSqR23&h0zyaa7HTNorIWsFgZFt9QKQnD?@01%6Kbto92$Vng&0B)4HaWJzbIs){i z+fHgR43;E-)uf1c4M>tyw3_6{+j$bgMgeja@Xtb zdMr$yv7?@8gZm->L32e`56Is?A!Mt#?^3Mo4}d*-Li`)%S%!J|BOB%sn_+(8k8heP V{nuiD7r+1j002ovPDHLkV1i2;x#<7^ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/avalugg/hisuian/icon.png b/graphics/pokemon/avalugg/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2b3f34771ac705f8aa383b0ef1fb757c2b8381 GIT binary patch literal 442 zcmV;r0Y(0aP)zlCg4xAP|Oq1BOfQ&8>YHZ~NTacpW@K z9yQ}RgH`at&5$aRMN!Z$O%f{qPua!gD~i8f?7mI@L*&Vd1FV3B1iU>hdn~2$0KCfp zoXQIM0$BNkSa*0{z@sh^&%6Z@$pdRjR8^={qrDM1n&}g7D1f2P-~wP;8)M*^cla^^ zr>ApWOoUn=AQm>$iki zrjUe*b56oUKaw!fkDV|s6DInRgqcb>xf5pcV zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00009 za7bBm000ie000ie0hKEb8vprlfO>GFc63R2B$ng8Tta18Zn|QmYDDs zF_ou?bSzho9eKG(o?Jv}Wv0Y5LfH}==a1q@FoHLKy1OL5`@+~C9t+_elFBYX+y>yf zjW>3Vs(5RpWH7<1C`h5LCHAABh;E3mG>4bIppBxHA%n-~4!FiBiq!rrkYv{Z^3C0| zlpBq{1KeF_xXTRnBf$+Iey_Mt!uT>T+ z!Xq!r{>7VAJfPO6ay=vfm&;jmyiNhYQz|%bA&!TNCQUgP)&zL+) literal 0 HcmV?d00001 diff --git a/graphics/pokemon/basculegion/iconf.png b/graphics/pokemon/basculegion/iconf.png new file mode 100644 index 0000000000000000000000000000000000000000..fb85ca6c0cdb77a1bd081b2c44656d676a706f20 GIT binary patch literal 474 zcmV<00VV#4P)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vprld(?2Fc60G2G(sEA|vqv74=#vug74O zXR25{Ty1q@2~z07a7|3JhKAI3tlAO`3~<|hx;VMtUy9-n%d)g*^GPD!+*L4OqMfGdSPZE8O-0hFW&x6cmPxd*9Rj>=r0V5XIo+%-Ut=muB| zQUNvxQvOH=<^Bb#6L6^<_<*uGKqrClsqo;@Y`8+Mwl;zXq8(Ry<-ljT6P-d0UGG2q z((qDgeCzK+0_;SsZ1EfeU>Y^A3=<+uTyS5(ot-1_n=zz@&wX*J!|K#equXgob?!!! z1U$1eVaNWbSdrd-F-&zjAchotuR{cj4$BcihvOzZ7Ii>(ySF-A-<9a#fY;&G>EOb3 zI`H>Q2g-HOxehYZ0qIvdEUN|`*l~$y3_8SrYBWKIn5W5guveBi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vpFbqX~1A@>T_XtHoAd@5AsCO*9 zDn5Z-L(p0?G6ZyURCS0&d&wU3Z+svKQhHVOdI@1$gE0_5fJ7#SS#(8adRGG65m^fW znB$rPW<*7}0!R+k#a@;bXhiz{96^j!?bO}MNR2*r-iWohZ#oiNfaSrHk-+k3k~n1< z#vtpw$?p39JPW`M#JGFYNXb;93pD$aGzc8lKBDV$*lD$sDFc8P{07xgddn(x@$Wd}D3KNgO zM4pI&uH_jR15+|oFjnd_5O-lpOd^H~31jD)lvrY5gPU^y+@0^^7X<&?!03r@TE5WV ze{){fjs4IR2;9^ORz|l`LUBf%3rtzmiHLGq%u%Fl&M`54N^!aoC|N8O_92j!4`p7l zSsWgUK9-l+Q#wP8Ln``STxa=KaYSsKfAVpERoJ4nz~q8DyU7(+Y|$YKDzfT!DGN2A zAYp%ZEAaDm8FYeL-LG_OVA%vP)Gz@A@S;b7%msJTwb-eA!Te&&f5O0@03uHT=_w#( zG!?jNra3L=+86ws2|;#qmLNq0xh1a68Crtojv&+D!4dRq2}+t4rA>m3BWTNFd;V1E zBSE3XLAlos1XVi=Oh3b#2&yrz8hZ9XP*o3Y3UtP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vp@k}(RyFbqX~1JMh3@BtKPrY^}jJA|Gm z(2^6#A?Z|T91~B4Qr85MSYErd)uxB^k>CmORRz}b{@I)vdDO?cvTN&sDjKMT1vyWo z3u@g0pqPO!*GScoMv~bYGT~0*uHRC_NN>zGAjAumLK^{4hyBP7%X4hl=?1$K1DCrV zSVnczy5%e88jm=i7dS@1gDj>vLjY#LfbgZ@1t}0V1wUJVFHHQ*EDTw;5`>8qa$W{u kq8%Unm{LCyVLtKW4fe&E?02@Pg8%>k07*qoM6N<$g2iNvQvd(} literal 0 HcmV?d00001 diff --git a/graphics/pokemon/decidueye/hisuian/icon.png b/graphics/pokemon/decidueye/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..997071396f393ebfb463eeb9ac891cc1a02c3915 GIT binary patch literal 410 zcmV;L0cHM)P)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vpzl09$2Fc60Q4^EMoiInb0l!2{Lr80NH zVk;BPMh6;hbAD_1@@7JU@aS3@>N_uVXrQ5uof!oby0#`D2}`DH%70IXQJBi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vprlCf@sFc60Q2B(f$;0^l@*^HFhVT*_2 z*U1oIj?@rkGm91KmmwQ6&lfBpaYeEtaeVfBE3U(bc*HlNQ>=}hNHzzgRh z(NgNT%I z4%n_ta$J*6^l|7SHh)dF9T=H&=V(o-l5O3I>ufGUY1A^s%nqTyy`n0u}7BA8&eS~hbKu*yX zY=?~(GAbeC_6WX78%alE1E}0ki%$ zVE8v+qI+OA(E~6uA0sd`A0C*A4-X7!9)W>JU_2jW=mtvk)0#aWGcdp8;}aOWW&MsK Ry&?br002ovPDHLkV1jKY%X9z$ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/electrode/hisuian/icon.png b/graphics/pokemon/electrode/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d624e246cb59c8bf27196d0faea8f8c2175428b5 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+AYtnv08z_wL>M|NsB$ zIbL(ldQJJ}^{#l%w<+KDE{Xc~O!M2fHCL}@J@e8`N{VuHbj-A@jRxxFEbxddW?X?_wfUrhg591jjv*GkZzuY4H5&-D7B|Z+s_wrqyY=3IwH(a0=MN~)Q`m9kzy+~g z0**bAma~|5tk`$=_l*6=B|g`88Gb&{=fZY*nvcSQ!1~1@48ODz7)(Wcn2MUFH%aPo zXiKDXFxiJ2uw35|vX<}d$HJ|5b1J{2rtf9?tUc*^U&*h%8|vhrz5Tpnrv1!y@8wsr YhU?Bee9`o%AJAD0p00i_>zopr01bL_fdBvi literal 0 HcmV?d00001 diff --git a/graphics/pokemon/enamorus/icon.png b/graphics/pokemon/enamorus/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c127c07345928e0594282d69f6d67b78f0610585 GIT binary patch literal 480 zcmV<60U!Q}P) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00009 za7bBm000XU000XU0RWnu7ytkPR!KxbR5*>r(z|YhFcb!0r0%i$0A)DdLBb1Dc&1Lx z5;DS4@(?^x+o3Gb1cpeJFkpsE;BxbYO07DyDii*7Y>p3~VSM$Vn%C>V#_NDtxxEV7 z)5cqGIc-)IoLhx{2FDK73()fmcJzWSOAG87s*`>f`ou=JmDmv^Nd$Fcrc24qdl>At zhqBB>(1s83<(N@XVO+yFc6(068Aj`dfp@-p69ve`u3x2skgw zL>#<~h>P) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00009 za7bBm000ie000ie0hKEb8vp*lD%%iFc5(K0@cY65RjZbk?g&FEGmW| zl_6e$74@w$!4j&F0aPiM0819)#&HO>+kvG+Jw)-R`;qTHLViC=*>|9{vcQQZV+W)* zxF$5Sa-c!0h^l~&;Z8t=CoG$?{WTDtapVUS6@k!%oU;Uj1P@iygA3+7+htg?J_Q9L z774Pw0ksThO6hJdOvckfzGWUo^urmjYKb4N6^uj4DV$zlD}%hFc63R20~;^aPWC867j7edgjux zLn#?!(r2)|21l0HVD&8dUj!Koy~XI`Ct14tlH`wyxd`-N+<<3p;f{`3fRV71$PsA` zU`9}DL9WXiS1A|0Wdo7Y^-!W=*)xjv8xTm1!(TK zJT7HE0MJzctj$WL2?)-|i-__=5J)FrZ)FV{vWo9R06wo+h^*lgklPxupf&#quQNRs zh;-!5OdUGG1`p|NKexzch==Re%%CUm_P%tI@g~Rns*NC&gyhFc5HhF`kwFwms}XpE$PZfY0vHTBU{UdOWzYtZH{VYN;ja3c zThwZe#bv+D*UBD*Tg{th-!8@l1hEhCC|=hud=}QbYP4mw00000NkvXXu0mjf41M9m literal 0 HcmV?d00001 diff --git a/graphics/pokemon/growlithe/hisuian/icon.png b/graphics/pokemon/growlithe/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b03733f0ff1b2db1108ff6de6f59d3c61345c5 GIT binary patch literal 327 zcmV-N0l5B&P)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vp>hBI8mz{hA}-~Xa!?+~w(^Fnv-ar>1Gk;TeD^>A)v^H( z5J(zcCimH9t+40u$SPQJ-3Qs%io3N5ez(+Z6Llt*XHua^8vL#M4<;QDV$TlD$sDFc8Q41e~0KZn08!@(4Ujm$Eft ziMQlg4HDhXaVpi@9cRZ*OC<&n9-`b|_kF+3=7$H^a(l7TS`Ks*&-!a|VO85mxG5ggb= zU|cmN93nA?2#izh5)$P45g4Z`w~41=L=^-WwyNUPJ)!dg%-&}lBng`cjL*CjV1%)Z z1G>lu3l3?KvDL)KgV^gVkq@@3z3{<&-TLqN_ySoTL?dithFt&v002ovPDHLkV1jR@ B`WXNK literal 0 HcmV?d00001 diff --git a/graphics/pokemon/lilligant/hisuian/icon.png b/graphics/pokemon/lilligant/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c8149843fc7723edee68da23fe4fcf43613288ac GIT binary patch literal 414 zcmV;P0b%}$P) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00009 za7bBm000ie000ie0hKEb8vp&tH!u!vCMY_}BISNCI)+ z%Wti%M-m8mUR%8CJ(3Au{jQtewM8=IpG$f9^>QSE->J`Q-9vK(!bB#wbDV$r(!pwjKoADteS=|dg@Ad8K0sg3Ui9iB zm}iilWJ5#Gk>(jfE=pjsp%;V2>8QK9kwWOH148!Cj;`Y;#P0>m;M+V1p!5RZ->~w~#RsqLc%iy>c zP^Z}tWHLZ0FQQXLap84WRaM44rb~)qBj6gmgz9t*kTBJ+MzneGhS67!h;$B>;ZsN~ zPtWglhWfMaA4^YX{h?7Q+Lq%nZc$lewNfeBgQ^?<&9!l_LeMXhi<(9Nyg$L1+!oP9 zb%J3$%>%+J!mx_x8B*AUO&rcsgt&?M@&W^V1Muezu~^jdOa50qG`%zG7EEp$f=fKQ@92h6ag7E|mV7OxvG=LE_399u7W)_sH{;};OXlswrI6>NC zp9PIC^cO*MUDV$*lFv@VFbu}?239#2D#EqOq~?bB^S+3U zXJE%ExOX%kPbCsuK!h9kyxus`uG#%`H)z<9OCo&(&<^8Kw64_Jg7AVpCao?W(eaaoeYGg$(}wI$}%j7A5Y{NsBhC~M?-h#;|Z?Oyu4?>8vhcQo{tF3iH`x8$VZc# z7MK$s;8BSHOymPJpMM9Y<-_O^9|4$iK2VMMNdK0PFQ4>87K`K;Z~y=R07*qoM6N<$ Ef?T4}4*&oF literal 0 HcmV?d00001 diff --git a/graphics/pokemon/qwilfish/hisuian/icon.png b/graphics/pokemon/qwilfish/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6936dfe88d797c89991fc12252461f9a5927e703 GIT binary patch literal 365 zcmV-z0h0cSP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000XU000XU0RWnu7ytkO<4Ht8R5*>@k~uJ z9U5_@2z6m7ji5`A2r1;zij@IjDT9AmzaRO8_=|9ElypJ>VwZAI{uL}kDG2KY!#W7o zIBcCTdn(_8(OTB%aNh(E?`9NI&#?<2DMVSM{HjS(OER{!vPIGgFKLFes!vBVn#xtz z`vGTpaBFQv&6-mQRGWr*mn(XoGH>&y;CR8S>^a!ZZ{_4PP{LI3_vyr62aIVLmL1>y zg@cJSL>&4g1RQ!DuNH71iXI*Z|F!gJvhaZeegy|CCO9mMpTpq^THuXpi^b+300000 LNkvXXu0mjf2HlrL literal 0 HcmV?d00001 diff --git a/graphics/pokemon/samurott/hisuian/icon.png b/graphics/pokemon/samurott/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fdcbe6718f66d009844976cc6e128751233712f6 GIT binary patch literal 503 zcmVi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000ie000ie0hKEb8vp*lCf^WFc60Q2G(_erK*K^0Hk>7mS@RQ zI)UgwHxQeLiab-d4wZNY3n^^G!BX%L<$88p2zx8F9vu7Ef9K!M$Jk#P-1ymCh03q_ z{37u(%xjXO00zmn#HIiGidG1Q1*~)_xIx2^L&>MFdYFN52-JydIKPaRuma=Wg)eHW z!QE)62T;Dj4jD(zrvQ)*GqJf>Ipflt7tn%0EtD#$hfV8+cto3Ox5W^0oMyA!%Ib(+ z5G$JxWuJt~xw8`8wg@#`DQu28 z8m+!dH?#l%002ovPDHLkV1l+-;UoY6 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/sliggoo/hisuian/icon.png b/graphics/pokemon/sliggoo/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c66baae5a9026bec9673ea2af98a23266459d31e GIT binary patch literal 392 zcmV;30eAk1P)DV$zk~?n0Fbsx$1421~1M>h5T4prh!E1ru zGi%qPKg&RLeKlS*s?7oVV9@;4ZG=V};XKO9NI>90V zjA4P?0uTJ9B9^urRb)d|t--OWR0JI#Nr9HIQK9QMJ*nHkiE1keca<-lApV6sxMN^YXhY=aB73f zyvYXozYWj&1%ZXE8xE1cYy06!jNsCr^U~pd1OBRq0P|IkA_Dl;qsT?5 m4|r literal 0 HcmV?d00001 diff --git a/graphics/pokemon/sneasel/hisuian/icon.png b/graphics/pokemon/sneasel/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bd9cae88b9bfbec648d238e0a8a067ee49c85e6e GIT binary patch literal 332 zcmV-S0ki&zP)DV$@k}(RyFbqX?1KmMuz=3A$(1T{|4VtAv z;9Q{4J0zpQG4U9P>Q0dYJwPMypvTwuA3ngJO)5{)zGGeXmj+Rg-|AxNE^9R?u(l1c zzUW(`88qNL)*5hkCkx0Lcfs`S$JJyPq!3J!OyQ6u e%b_4Y`|$w{9f&2&97(zW0000DV$@)6Gi5KoAG;d4r+gsh2!}haO5#J({yp zWKTl+G#iKzX1I4LMyJT zU%uoZbARSq^Oh_C(pqnPP#TIf#XdlDJvMtdt-Bh$8&8x4eD8we#aLBUs79fc6F?e?JBZ` zMHML?Ef3&eA{B68G5k_y#;00LNtuCoV#PDwY=>Nf=OZXm5dc|CwhK|>Hcdway+s!O z$EpR%;Tl0=yhe~PRtwTGKjm6bE?#ymNWA?<5Q}OBv8YxMi)sb2s78?J30MijSWvG7 z5#Krv11HGx=Yf?VcOQOSTvmc+Vpwv5Bq_Hip=cmEe5`EI^MQmtKvgvT3FKEW-=|m1 UP)Wx>&Hw-a07*qoM6N<$g4jyRDgXcg literal 0 HcmV?d00001 diff --git a/graphics/pokemon/typhlosion/hisuian/icon.png b/graphics/pokemon/typhlosion/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e0474968cfd1650cfe661960e9f06d789bd855 GIT binary patch literal 438 zcmV;n0ZIOeP) zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00009 za7bBm000ie000ie0hKEb8vprlCf&TFc3if2jZp_0?FKO=vQTurh1e% z|3UsCTj7j78;kZEI;Bt=+f!O|!<8j#A+NCa$P3oB`~0|2kE@--URwukkNin&I! z>2C2Lk0%GmNoNf_4hcVYaDzJDV$89)B-O>}wl@_VpYU~zqX=jia$mUPKw$M z3k8%R8SS39?sR*KjW_dlM|NsBJ zOB}y_)4ZDG_-%@2clG}yue0xp=ltKYWXaM0S!?DbB}F+pI!3OXkOI`pS>O>_%)r2R z1cVu literal 0 HcmV?d00001 diff --git a/graphics/pokemon/wyrdeer/icon.png b/graphics/pokemon/wyrdeer/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..905dfe083c941b295ae2a9020d31b7f1a2bbbf27 GIT binary patch literal 395 zcmV;60d)R}P)DV$FbqX`1KxpK777se=6szx8wF}0 z2kBvy$%{nDi`BuZg2ECLpi5D7>K`-^{N$tk0e(lQ?Wv|v^mx8h%S-E;dI4vg0k+vX zHoZCeliae30QOF`pOoI)D8Z46` zi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000XU000XU0RWnu7ytkP@JU2LR5*>bQ@e`eFckG4Tqebq3CK)}U68=)1?KP~uchY8~1 z4B;!5cHY^k4hI6p@KRI5Wyk9?mzwlM~$2B^-?bxhG ziCr?Z+hNwoNw7dy#Ni=!7DD^=u^(>N4N=FUgF!CFFfyA!ac4|nbOBt!;{yQr0Q`pq zk2SqqB4~%&$vYKP&FtJ4gafa59zJK)!)wyaCQ+}z0K*MupfCdHgBQ}w<424UmAP0d zXgt+{QILya7>ikgVa&xqc^=Ik9F>NgXP(7Y{iqGkKG8%wB=}DE+|WZB0r2XicEp@_ zBvw7CRy Uv}+uNhX4Qo07*qoM6N<$g1DC;LjV8( literal 0 HcmV?d00001 diff --git a/graphics/pokemon/zorua/hisuian/icon.png b/graphics/pokemon/zorua/hisuian/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..17f9229a2f208c41b7b4b9a9567403643eb3ccdb GIT binary patch literal 431 zcmV;g0Z{&lP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00009 za7bBm000XU000XU0RWnu7ytkPB}qg@lD|&FFc8M`2B)MOOT|Snw34ml#L|U# zpick;BYCF`3>}i44m=A%>X0FSjOgION06vvo3RVxHh=o=^WEteMSrY#2;Psr0MG0j zpbjH+5D_WQ!V!~n12j`Uz$Dwml4z-GC{7lW5+(bAtpIP7VOP(y!68mWbL_2SEU#DC z?^^q{%5h&xvzlA(@Fqu-Tfqq2VpowBRD&os@AI%A;stfm*-ufn9KCINmaue%VI07} zNN~Y_UcvGa91CC2MR1T`0QrmogW9+ju0JNC9CEczDdXKNKtq(RU%x5)DYKwNv}|Vq zb01?T55=hoF7Tlg=Bc%g6xT1v)lASQrdyQNt^GzdSGi~%U`&jcWE@~%B3ZJ_2lF|6 Zd;!&6gKf?XQH1~i002ovPDHLkV1k47xjp~@ literal 0 HcmV?d00001 diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 8f40f9a7be..8e1c03d104 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -911,11 +911,18 @@ enum { NATIONAL_DEX_GLASTRIER, NATIONAL_DEX_SPECTRIER, NATIONAL_DEX_CALYREX, + NATIONAL_DEX_WYRDEER, + NATIONAL_DEX_KLEAVOR, + NATIONAL_DEX_URSALUNA, + NATIONAL_DEX_BASCULEGION, + NATIONAL_DEX_SNEASLER, + NATIONAL_DEX_OVERQWIL, + NATIONAL_DEX_ENAMORUS, }; #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI -#define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX +#define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS #define POKEMON_SLOTS_NUMBER (NATIONAL_DEX_COUNT + 1) // Hoenn Pokedex order diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index bd5fe81511..3edda316d7 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -399,7 +399,8 @@ #define FLAG_ULTRA_BEAST (1 << 2) #define FLAG_ALOLAN_FORM (1 << 3) #define FLAG_GALARIAN_FORM (1 << 4) -#define FLAG_GENDER_DIFFERENCE (1 << 5) +#define FLAG_HISUIAN_FORM (1 << 5) +#define FLAG_GENDER_DIFFERENCE (1 << 6) #define LEGENDARY_PERFECT_IV_COUNT 3 diff --git a/include/constants/species.h b/include/constants/species.h index b8689a32af..03bd9eabbc 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -900,8 +900,15 @@ #define SPECIES_GLASTRIER 896 #define SPECIES_SPECTRIER 897 #define SPECIES_CALYREX 898 +#define SPECIES_WYRDEER 899 +#define SPECIES_KLEAVOR 900 +#define SPECIES_URSALUNA 901 +#define SPECIES_BASCULEGION 902 +#define SPECIES_SNEASLER 903 +#define SPECIES_OVERQWIL 904 +#define SPECIES_ENAMORUS 905 -#define FORMS_START SPECIES_CALYREX +#define FORMS_START SPECIES_ENAMORUS // Megas #define SPECIES_VENUSAUR_MEGA FORMS_START + 1 @@ -998,348 +1005,370 @@ #define SPECIES_YAMASK_GALARIAN FORMS_START + 86 #define SPECIES_STUNFISK_GALARIAN FORMS_START + 87 +//Hisuian Forms +#define SPECIES_GROWLITHE_HISUIAN FORMS_START + 88 +#define SPECIES_ARCANINE_HISUIAN FORMS_START + 89 +#define SPECIES_VOLTORB_HISUIAN FORMS_START + 90 +#define SPECIES_ELECTRODE_HISUIAN FORMS_START + 91 +#define SPECIES_TYPHLOSION_HISUIAN FORMS_START + 92 +#define SPECIES_QWILFISH_HISUIAN FORMS_START + 93 +#define SPECIES_SNEASEL_HISUIAN FORMS_START + 94 +#define SPECIES_SAMUROTT_HISUIAN FORMS_START + 95 +#define SPECIES_LILLIGANT_HISUIAN FORMS_START + 96 +#define SPECIES_ZORUA_HISUIAN FORMS_START + 97 +#define SPECIES_ZOROARK_HISUIAN FORMS_START + 98 +#define SPECIES_BRAVIARY_HISUIAN FORMS_START + 99 +#define SPECIES_SLIGGOO_HISUIAN FORMS_START + 100 +#define SPECIES_GOODRA_HISUIAN FORMS_START + 101 +#define SPECIES_AVALUGG_HISUIAN FORMS_START + 102 +#define SPECIES_DECIDUEYE_HISUIAN FORMS_START + 103 + // Misc Forms // Cosplay Pikachu -#define SPECIES_PIKACHU_COSPLAY FORMS_START + 88 -#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 89 -#define SPECIES_PIKACHU_BELLE FORMS_START + 90 -#define SPECIES_PIKACHU_POP_STAR FORMS_START + 91 -#define SPECIES_PIKACHU_PH_D FORMS_START + 92 -#define SPECIES_PIKACHU_LIBRE FORMS_START + 93 +#define SPECIES_PIKACHU_COSPLAY FORMS_START + 104 +#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 105 +#define SPECIES_PIKACHU_BELLE FORMS_START + 106 +#define SPECIES_PIKACHU_POP_STAR FORMS_START + 107 +#define SPECIES_PIKACHU_PH_D FORMS_START + 108 +#define SPECIES_PIKACHU_LIBRE FORMS_START + 109 // Cap Pikachu -#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 94 -#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 95 -#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 96 -#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 97 -#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 98 -#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 99 -#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 100 -#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 101 +#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 110 +#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 111 +#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 112 +#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 113 +#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 114 +#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 115 +#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 116 +#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 117 // Pichu -#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 102 +#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118 // Unown -#define SPECIES_UNOWN_B FORMS_START + 103 -#define SPECIES_UNOWN_C FORMS_START + 104 -#define SPECIES_UNOWN_D FORMS_START + 105 -#define SPECIES_UNOWN_E FORMS_START + 106 -#define SPECIES_UNOWN_F FORMS_START + 107 -#define SPECIES_UNOWN_G FORMS_START + 108 -#define SPECIES_UNOWN_H FORMS_START + 109 -#define SPECIES_UNOWN_I FORMS_START + 110 -#define SPECIES_UNOWN_J FORMS_START + 111 -#define SPECIES_UNOWN_K FORMS_START + 112 -#define SPECIES_UNOWN_L FORMS_START + 113 -#define SPECIES_UNOWN_M FORMS_START + 114 -#define SPECIES_UNOWN_N FORMS_START + 115 -#define SPECIES_UNOWN_O FORMS_START + 116 -#define SPECIES_UNOWN_P FORMS_START + 117 -#define SPECIES_UNOWN_Q FORMS_START + 118 -#define SPECIES_UNOWN_R FORMS_START + 119 -#define SPECIES_UNOWN_S FORMS_START + 120 -#define SPECIES_UNOWN_T FORMS_START + 121 -#define SPECIES_UNOWN_U FORMS_START + 122 -#define SPECIES_UNOWN_V FORMS_START + 123 -#define SPECIES_UNOWN_W FORMS_START + 124 -#define SPECIES_UNOWN_X FORMS_START + 125 -#define SPECIES_UNOWN_Y FORMS_START + 126 -#define SPECIES_UNOWN_Z FORMS_START + 127 -#define SPECIES_UNOWN_EMARK FORMS_START + 128 -#define SPECIES_UNOWN_QMARK FORMS_START + 129 +#define SPECIES_UNOWN_B FORMS_START + 119 +#define SPECIES_UNOWN_C FORMS_START + 120 +#define SPECIES_UNOWN_D FORMS_START + 121 +#define SPECIES_UNOWN_E FORMS_START + 122 +#define SPECIES_UNOWN_F FORMS_START + 123 +#define SPECIES_UNOWN_G FORMS_START + 124 +#define SPECIES_UNOWN_H FORMS_START + 125 +#define SPECIES_UNOWN_I FORMS_START + 126 +#define SPECIES_UNOWN_J FORMS_START + 127 +#define SPECIES_UNOWN_K FORMS_START + 128 +#define SPECIES_UNOWN_L FORMS_START + 129 +#define SPECIES_UNOWN_M FORMS_START + 130 +#define SPECIES_UNOWN_N FORMS_START + 131 +#define SPECIES_UNOWN_O FORMS_START + 132 +#define SPECIES_UNOWN_P FORMS_START + 133 +#define SPECIES_UNOWN_Q FORMS_START + 134 +#define SPECIES_UNOWN_R FORMS_START + 135 +#define SPECIES_UNOWN_S FORMS_START + 136 +#define SPECIES_UNOWN_T FORMS_START + 137 +#define SPECIES_UNOWN_U FORMS_START + 138 +#define SPECIES_UNOWN_V FORMS_START + 139 +#define SPECIES_UNOWN_W FORMS_START + 140 +#define SPECIES_UNOWN_X FORMS_START + 141 +#define SPECIES_UNOWN_Y FORMS_START + 142 +#define SPECIES_UNOWN_Z FORMS_START + 143 +#define SPECIES_UNOWN_EMARK FORMS_START + 144 +#define SPECIES_UNOWN_QMARK FORMS_START + 145 // Castform -#define SPECIES_CASTFORM_SUNNY FORMS_START + 130 -#define SPECIES_CASTFORM_RAINY FORMS_START + 131 -#define SPECIES_CASTFORM_SNOWY FORMS_START + 132 +#define SPECIES_CASTFORM_SUNNY FORMS_START + 146 +#define SPECIES_CASTFORM_RAINY FORMS_START + 147 +#define SPECIES_CASTFORM_SNOWY FORMS_START + 148 // Deoxys -#define SPECIES_DEOXYS_ATTACK FORMS_START + 133 -#define SPECIES_DEOXYS_DEFENSE FORMS_START + 134 -#define SPECIES_DEOXYS_SPEED FORMS_START + 135 +#define SPECIES_DEOXYS_ATTACK FORMS_START + 149 +#define SPECIES_DEOXYS_DEFENSE FORMS_START + 150 +#define SPECIES_DEOXYS_SPEED FORMS_START + 151 // Burmy -#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 136 -#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 137 +#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152 +#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153 // Wormadam -#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 138 -#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 139 +#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 154 +#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 155 // Cherrim -#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 140 +#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 156 // Shellos -#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 141 +#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 157 // Gastrodon -#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 142 +#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 158 // Rotom -#define SPECIES_ROTOM_HEAT FORMS_START + 143 -#define SPECIES_ROTOM_WASH FORMS_START + 144 -#define SPECIES_ROTOM_FROST FORMS_START + 145 -#define SPECIES_ROTOM_FAN FORMS_START + 146 -#define SPECIES_ROTOM_MOW FORMS_START + 147 +#define SPECIES_ROTOM_HEAT FORMS_START + 159 +#define SPECIES_ROTOM_WASH FORMS_START + 160 +#define SPECIES_ROTOM_FROST FORMS_START + 161 +#define SPECIES_ROTOM_FAN FORMS_START + 162 +#define SPECIES_ROTOM_MOW FORMS_START + 163 -// Giratina -#define SPECIES_GIRATINA_ORIGIN FORMS_START + 148 +// Origin Forme +#define SPECIES_DIALGA_ORIGIN FORMS_START + 164 +#define SPECIES_PALKIA_ORIGIN FORMS_START + 165 +#define SPECIES_GIRATINA_ORIGIN FORMS_START + 166 // Shaymin -#define SPECIES_SHAYMIN_SKY FORMS_START + 149 +#define SPECIES_SHAYMIN_SKY FORMS_START + 167 // Arceus -#define SPECIES_ARCEUS_FIGHTING FORMS_START + 150 -#define SPECIES_ARCEUS_FLYING FORMS_START + 151 -#define SPECIES_ARCEUS_POISON FORMS_START + 152 -#define SPECIES_ARCEUS_GROUND FORMS_START + 153 -#define SPECIES_ARCEUS_ROCK FORMS_START + 154 -#define SPECIES_ARCEUS_BUG FORMS_START + 155 -#define SPECIES_ARCEUS_GHOST FORMS_START + 156 -#define SPECIES_ARCEUS_STEEL FORMS_START + 157 -#define SPECIES_ARCEUS_FIRE FORMS_START + 158 -#define SPECIES_ARCEUS_WATER FORMS_START + 159 -#define SPECIES_ARCEUS_GRASS FORMS_START + 160 -#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 161 -#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 162 -#define SPECIES_ARCEUS_ICE FORMS_START + 163 -#define SPECIES_ARCEUS_DRAGON FORMS_START + 164 -#define SPECIES_ARCEUS_DARK FORMS_START + 165 -#define SPECIES_ARCEUS_FAIRY FORMS_START + 166 +#define SPECIES_ARCEUS_FIGHTING FORMS_START + 168 +#define SPECIES_ARCEUS_FLYING FORMS_START + 169 +#define SPECIES_ARCEUS_POISON FORMS_START + 170 +#define SPECIES_ARCEUS_GROUND FORMS_START + 171 +#define SPECIES_ARCEUS_ROCK FORMS_START + 172 +#define SPECIES_ARCEUS_BUG FORMS_START + 173 +#define SPECIES_ARCEUS_GHOST FORMS_START + 174 +#define SPECIES_ARCEUS_STEEL FORMS_START + 175 +#define SPECIES_ARCEUS_FIRE FORMS_START + 176 +#define SPECIES_ARCEUS_WATER FORMS_START + 177 +#define SPECIES_ARCEUS_GRASS FORMS_START + 178 +#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 179 +#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 180 +#define SPECIES_ARCEUS_ICE FORMS_START + 181 +#define SPECIES_ARCEUS_DRAGON FORMS_START + 182 +#define SPECIES_ARCEUS_DARK FORMS_START + 183 +#define SPECIES_ARCEUS_FAIRY FORMS_START + 184 // Basculin -#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 167 +#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 185 +#define SPECIES_BASCULIN_WHITE_STRIPED FORMS_START + 186 // Darmanitan -#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 168 -#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 169 +#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 187 +#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 188 // Deerling -#define SPECIES_DEERLING_SUMMER FORMS_START + 170 -#define SPECIES_DEERLING_AUTUMN FORMS_START + 171 -#define SPECIES_DEERLING_WINTER FORMS_START + 172 +#define SPECIES_DEERLING_SUMMER FORMS_START + 189 +#define SPECIES_DEERLING_AUTUMN FORMS_START + 190 +#define SPECIES_DEERLING_WINTER FORMS_START + 191 // Sawsbuck -#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 173 -#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 174 -#define SPECIES_SAWSBUCK_WINTER FORMS_START + 175 +#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 192 +#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 193 +#define SPECIES_SAWSBUCK_WINTER FORMS_START + 194 // Therian Forms -#define SPECIES_TORNADUS_THERIAN FORMS_START + 176 -#define SPECIES_THUNDURUS_THERIAN FORMS_START + 177 -#define SPECIES_LANDORUS_THERIAN FORMS_START + 178 +#define SPECIES_TORNADUS_THERIAN FORMS_START + 195 +#define SPECIES_THUNDURUS_THERIAN FORMS_START + 196 +#define SPECIES_LANDORUS_THERIAN FORMS_START + 197 +#define SPECIES_ENAMORUS_THERIAN FORMS_START + 198 // Kyurem -#define SPECIES_KYUREM_WHITE FORMS_START + 179 -#define SPECIES_KYUREM_BLACK FORMS_START + 180 +#define SPECIES_KYUREM_WHITE FORMS_START + 199 +#define SPECIES_KYUREM_BLACK FORMS_START + 200 // Keldeo -#define SPECIES_KELDEO_RESOLUTE FORMS_START + 181 +#define SPECIES_KELDEO_RESOLUTE FORMS_START + 201 // Meloetta -#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 182 +#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 202 // Genesect -#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 183 -#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 184 -#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 185 -#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 186 +#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 203 +#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 204 +#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 205 +#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 206 // Greninja -#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 187 -#define SPECIES_GRENINJA_ASH FORMS_START + 188 +#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 207 +#define SPECIES_GRENINJA_ASH FORMS_START + 208 // Vivillon -#define SPECIES_VIVILLON_POLAR FORMS_START + 189 -#define SPECIES_VIVILLON_TUNDRA FORMS_START + 190 -#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 191 -#define SPECIES_VIVILLON_GARDEN FORMS_START + 192 -#define SPECIES_VIVILLON_ELEGANT FORMS_START + 193 -#define SPECIES_VIVILLON_MEADOW FORMS_START + 194 -#define SPECIES_VIVILLON_MODERN FORMS_START + 195 -#define SPECIES_VIVILLON_MARINE FORMS_START + 196 -#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 197 -#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 198 -#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 199 -#define SPECIES_VIVILLON_RIVER FORMS_START + 200 -#define SPECIES_VIVILLON_MONSOON FORMS_START + 201 -#define SPECIES_VIVILLON_SAVANNA FORMS_START + 202 -#define SPECIES_VIVILLON_SUN FORMS_START + 203 -#define SPECIES_VIVILLON_OCEAN FORMS_START + 204 -#define SPECIES_VIVILLON_JUNGLE FORMS_START + 205 -#define SPECIES_VIVILLON_FANCY FORMS_START + 206 -#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 207 +#define SPECIES_VIVILLON_POLAR FORMS_START + 209 +#define SPECIES_VIVILLON_TUNDRA FORMS_START + 210 +#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 211 +#define SPECIES_VIVILLON_GARDEN FORMS_START + 212 +#define SPECIES_VIVILLON_ELEGANT FORMS_START + 213 +#define SPECIES_VIVILLON_MEADOW FORMS_START + 214 +#define SPECIES_VIVILLON_MODERN FORMS_START + 215 +#define SPECIES_VIVILLON_MARINE FORMS_START + 216 +#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 217 +#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 218 +#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 219 +#define SPECIES_VIVILLON_RIVER FORMS_START + 220 +#define SPECIES_VIVILLON_MONSOON FORMS_START + 221 +#define SPECIES_VIVILLON_SAVANNA FORMS_START + 222 +#define SPECIES_VIVILLON_SUN FORMS_START + 223 +#define SPECIES_VIVILLON_OCEAN FORMS_START + 224 +#define SPECIES_VIVILLON_JUNGLE FORMS_START + 225 +#define SPECIES_VIVILLON_FANCY FORMS_START + 226 +#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 227 // Flabébé -#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 208 -#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 209 -#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 210 -#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 211 +#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 228 +#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 229 +#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 230 +#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 231 // Floette -#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 212 -#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 213 -#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 214 -#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 215 -#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 216 +#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 232 +#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 233 +#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 234 +#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 235 +#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 236 // Florges -#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 217 -#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 218 -#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 219 -#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 220 +#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 237 +#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 238 +#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 239 +#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 240 // Furfrou -#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 221 -#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 222 -#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 223 -#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 224 -#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 225 -#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 226 -#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 227 -#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 228 -#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 229 +#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 241 +#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 242 +#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 243 +#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 244 +#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 245 +#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 246 +#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 247 +#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 248 +#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 249 // Meowstic -#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 230 +#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 250 // Aegislash -#define SPECIES_AEGISLASH_BLADE FORMS_START + 231 +#define SPECIES_AEGISLASH_BLADE FORMS_START + 251 // Pumpkaboo -#define SPECIES_PUMPKABOO_SMALL FORMS_START + 232 -#define SPECIES_PUMPKABOO_LARGE FORMS_START + 233 -#define SPECIES_PUMPKABOO_SUPER FORMS_START + 234 +#define SPECIES_PUMPKABOO_SMALL FORMS_START + 252 +#define SPECIES_PUMPKABOO_LARGE FORMS_START + 253 +#define SPECIES_PUMPKABOO_SUPER FORMS_START + 254 // Gourgeist -#define SPECIES_GOURGEIST_SMALL FORMS_START + 235 -#define SPECIES_GOURGEIST_LARGE FORMS_START + 236 -#define SPECIES_GOURGEIST_SUPER FORMS_START + 237 +#define SPECIES_GOURGEIST_SMALL FORMS_START + 255 +#define SPECIES_GOURGEIST_LARGE FORMS_START + 256 +#define SPECIES_GOURGEIST_SUPER FORMS_START + 257 // Xerneas -#define SPECIES_XERNEAS_ACTIVE FORMS_START + 238 +#define SPECIES_XERNEAS_ACTIVE FORMS_START + 258 // Zygarde -#define SPECIES_ZYGARDE_10 FORMS_START + 239 -#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 240 -#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 241 -#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 242 +#define SPECIES_ZYGARDE_10 FORMS_START + 259 +#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 260 +#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 261 +#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 262 // Hoopa -#define SPECIES_HOOPA_UNBOUND FORMS_START + 243 +#define SPECIES_HOOPA_UNBOUND FORMS_START + 263 // Oricorio -#define SPECIES_ORICORIO_POM_POM FORMS_START + 244 -#define SPECIES_ORICORIO_PAU FORMS_START + 245 -#define SPECIES_ORICORIO_SENSU FORMS_START + 246 +#define SPECIES_ORICORIO_POM_POM FORMS_START + 264 +#define SPECIES_ORICORIO_PAU FORMS_START + 265 +#define SPECIES_ORICORIO_SENSU FORMS_START + 266 // Rockruff -#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 247 +#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 267 // Lycanroc -#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 248 -#define SPECIES_LYCANROC_DUSK FORMS_START + 249 +#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 268 +#define SPECIES_LYCANROC_DUSK FORMS_START + 269 // Wishiwashi -#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 250 +#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 270 // Silvally -#define SPECIES_SILVALLY_FIGHTING FORMS_START + 251 -#define SPECIES_SILVALLY_FLYING FORMS_START + 252 -#define SPECIES_SILVALLY_POISON FORMS_START + 253 -#define SPECIES_SILVALLY_GROUND FORMS_START + 254 -#define SPECIES_SILVALLY_ROCK FORMS_START + 255 -#define SPECIES_SILVALLY_BUG FORMS_START + 256 -#define SPECIES_SILVALLY_GHOST FORMS_START + 257 -#define SPECIES_SILVALLY_STEEL FORMS_START + 258 -#define SPECIES_SILVALLY_FIRE FORMS_START + 259 -#define SPECIES_SILVALLY_WATER FORMS_START + 260 -#define SPECIES_SILVALLY_GRASS FORMS_START + 261 -#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 262 -#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 263 -#define SPECIES_SILVALLY_ICE FORMS_START + 264 -#define SPECIES_SILVALLY_DRAGON FORMS_START + 265 -#define SPECIES_SILVALLY_DARK FORMS_START + 266 -#define SPECIES_SILVALLY_FAIRY FORMS_START + 267 +#define SPECIES_SILVALLY_FIGHTING FORMS_START + 271 +#define SPECIES_SILVALLY_FLYING FORMS_START + 272 +#define SPECIES_SILVALLY_POISON FORMS_START + 273 +#define SPECIES_SILVALLY_GROUND FORMS_START + 274 +#define SPECIES_SILVALLY_ROCK FORMS_START + 275 +#define SPECIES_SILVALLY_BUG FORMS_START + 276 +#define SPECIES_SILVALLY_GHOST FORMS_START + 277 +#define SPECIES_SILVALLY_STEEL FORMS_START + 278 +#define SPECIES_SILVALLY_FIRE FORMS_START + 279 +#define SPECIES_SILVALLY_WATER FORMS_START + 280 +#define SPECIES_SILVALLY_GRASS FORMS_START + 281 +#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 282 +#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 283 +#define SPECIES_SILVALLY_ICE FORMS_START + 284 +#define SPECIES_SILVALLY_DRAGON FORMS_START + 285 +#define SPECIES_SILVALLY_DARK FORMS_START + 286 +#define SPECIES_SILVALLY_FAIRY FORMS_START + 287 // Minior -#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 268 -#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 269 -#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 270 -#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 271 -#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 272 -#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 273 -#define SPECIES_MINIOR_CORE_RED FORMS_START + 274 -#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 275 -#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 276 -#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 277 -#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 278 -#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 279 -#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 280 +#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 288 +#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 289 +#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 290 +#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 291 +#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 292 +#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 293 +#define SPECIES_MINIOR_CORE_RED FORMS_START + 294 +#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 295 +#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 296 +#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 297 +#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 298 +#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 299 +#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 300 // Mimikyu -#define SPECIES_MIMIKYU_BUSTED FORMS_START + 281 +#define SPECIES_MIMIKYU_BUSTED FORMS_START + 301 // Necrozma -#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 282 -#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 283 -#define SPECIES_NECROZMA_ULTRA FORMS_START + 284 +#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 302 +#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 303 +#define SPECIES_NECROZMA_ULTRA FORMS_START + 304 // Magearna -#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 285 +#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 305 // Cramorant -#define SPECIES_CRAMORANT_GULPING FORMS_START + 286 -#define SPECIES_CRAMORANT_GORGING FORMS_START + 287 +#define SPECIES_CRAMORANT_GULPING FORMS_START + 306 +#define SPECIES_CRAMORANT_GORGING FORMS_START + 307 // Toxtricity -#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 288 +#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 308 // Sinistea -#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 289 +#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 309 // Polteageist -#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 290 +#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 310 // Alcremie -#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 291 -#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 292 -#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 293 -#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 294 -#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 295 -#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 296 -#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 297 -#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 298 +#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 311 +#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 312 +#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 313 +#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 314 +#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 315 +#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 316 +#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 317 +#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 318 // Eiscue -#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 299 +#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 319 // Indeedee -#define SPECIES_INDEEDEE_FEMALE FORMS_START + 300 +#define SPECIES_INDEEDEE_FEMALE FORMS_START + 320 // Morpeko -#define SPECIES_MORPEKO_HANGRY FORMS_START + 301 +#define SPECIES_MORPEKO_HANGRY FORMS_START + 321 // Zacian -#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 302 +#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 322 // Zamazenta -#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 303 +#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 323 // Eternatus -#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 304 +#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 324 // Urshifu -#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 305 +#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 325 // Zarude -#define SPECIES_ZARUDE_DADA FORMS_START + 306 +#define SPECIES_ZARUDE_DADA FORMS_START + 326 // Calyrex -#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 307 -#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 308 +#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327 +#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328 #define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1 #define NUM_SPECIES SPECIES_EGG diff --git a/include/graphics.h b/include/graphics.h index 365b40dc14..724425260f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -949,6 +949,14 @@ extern const u32 gMonFrontPic_Regidrago[]; extern const u32 gMonFrontPic_Glastrier[]; extern const u32 gMonFrontPic_Spectrier[]; extern const u32 gMonFrontPic_Calyrex[]; +//extern const u32 gMonFrontPic_Wyrdeer[]; +//extern const u32 gMonFrontPic_Kleavor[]; +//extern const u32 gMonFrontPic_Ursaluna[]; +//extern const u32 gMonFrontPic_Basculegion[]; +//extern const u32 gMonFrontPic_BasculegionF[]; +//extern const u32 gMonFrontPic_Sneasler[]; +//extern const u32 gMonFrontPic_Overqwil[]; +//extern const u32 gMonFrontPic_Enamorus[]; extern const u32 gMonFrontPic_VenusaurMega[]; extern const u32 gMonFrontPic_CharizardMegaX[]; extern const u32 gMonFrontPic_CharizardMegaY[]; @@ -1036,6 +1044,22 @@ extern const u32 gMonFrontPic_DarumakaGalarian[]; extern const u32 gMonFrontPic_DarmanitanGalarian[]; extern const u32 gMonFrontPic_YamaskGalarian[]; extern const u32 gMonFrontPic_StunfiskGalarian[]; +//extern const u32 gMonFrontPic_GrowlitheHisuian[]; +//extern const u32 gMonFrontPic_ArcanineHisuian[]; +//extern const u32 gMonFrontPic_VoltorbHisuian[]; +//extern const u32 gMonFrontPic_ElectrodeHisuian[]; +//extern const u32 gMonFrontPic_TyphlosionHisuian[]; +//extern const u32 gMonFrontPic_QwilfishHisuian[]; +//extern const u32 gMonFrontPic_SneaselHisuian[]; +//extern const u32 gMonFrontPic_SamurottHisuian[]; +//extern const u32 gMonFrontPic_LilligantHisuian[]; +//extern const u32 gMonFrontPic_ZoruaHisuian[]; +//extern const u32 gMonFrontPic_ZoroarkHisuian[]; +//extern const u32 gMonFrontPic_BraviaryHisuian[]; +//extern const u32 gMonFrontPic_SliggooHisuian[]; +//extern const u32 gMonFrontPic_GoodraHisuian[]; +//extern const u32 gMonFrontPic_AvaluggHisuian[]; +//extern const u32 gMonFrontPic_DecidueyeHisuian[]; extern const u32 gMonFrontPic_PikachuCosplay[]; extern const u32 gMonFrontPic_PikachuRockStar[]; extern const u32 gMonFrontPic_PikachuBelle[]; @@ -1096,9 +1120,12 @@ extern const u32 gMonFrontPic_RotomWash[]; extern const u32 gMonFrontPic_RotomFrost[]; extern const u32 gMonFrontPic_RotomFan[]; extern const u32 gMonFrontPic_RotomMow[]; +//extern const u32 gMonFrontPic_DialgaOrigin[]; +//extern const u32 gMonFrontPic_PalkiaOrigin[]; extern const u32 gMonFrontPic_GiratinaOrigin[]; extern const u32 gMonFrontPic_ShayminSky[]; extern const u32 gMonFrontPic_BasculinBlueStriped[]; +//extern const u32 gMonFrontPic_BasculinWhiteStriped[]; extern const u32 gMonFrontPic_DarmanitanZenMode[]; extern const u32 gMonFrontPic_DarmanitanZenModeGalarian[]; extern const u32 gMonFrontPic_SawsbuckSummer[]; @@ -1107,6 +1134,7 @@ extern const u32 gMonFrontPic_SawsbuckWinter[]; extern const u32 gMonFrontPic_TornadusTherian[]; extern const u32 gMonFrontPic_ThundurusTherian[]; extern const u32 gMonFrontPic_LandorusTherian[]; +//extern const u32 gMonFrontPic_EnamorusTherian[]; extern const u32 gMonFrontPic_KyuremWhite[]; extern const u32 gMonFrontPic_KyuremBlack[]; extern const u32 gMonFrontPic_KeldeoResolute[]; @@ -2101,6 +2129,14 @@ extern const u32 gMonBackPic_Regidrago[]; extern const u32 gMonBackPic_Glastrier[]; extern const u32 gMonBackPic_Spectrier[]; extern const u32 gMonBackPic_Calyrex[]; +//extern const u32 gMonBackPic_Wyrdeer[]; +//extern const u32 gMonBackPic_Kleavor[]; +//extern const u32 gMonBackPic_Ursaluna[]; +//extern const u32 gMonBackPic_Basculegion[]; +//extern const u32 gMonBackPic_BasculegionF[]; +//extern const u32 gMonBackPic_Sneasler[]; +//extern const u32 gMonBackPic_Overqwil[]; +//extern const u32 gMonBackPic_Enamorus[]; extern const u32 gMonBackPic_VenusaurMega[]; extern const u32 gMonBackPic_CharizardMegaX[]; extern const u32 gMonBackPic_CharizardMegaY[]; @@ -2188,6 +2224,22 @@ extern const u32 gMonBackPic_DarumakaGalarian[]; extern const u32 gMonBackPic_DarmanitanGalarian[]; extern const u32 gMonBackPic_YamaskGalarian[]; extern const u32 gMonBackPic_StunfiskGalarian[]; +//extern const u32 gMonBackPic_GrowlitheHisuian[]; +//extern const u32 gMonBackPic_ArcanineHisuian[]; +//extern const u32 gMonBackPic_VoltorbHisuian[]; +//extern const u32 gMonBackPic_ElectrodeHisuian[]; +//extern const u32 gMonBackPic_TyphlosionHisuian[]; +//extern const u32 gMonBackPic_QwilfishHisuian[]; +//extern const u32 gMonBackPic_SneaselHisuian[]; +//extern const u32 gMonBackPic_SamurottHisuian[]; +//extern const u32 gMonBackPic_LilligantHisuian[]; +//extern const u32 gMonBackPic_ZoruaHisuian[]; +//extern const u32 gMonBackPic_ZoroarkHisuian[]; +//extern const u32 gMonBackPic_BraviaryHisuian[]; +//extern const u32 gMonBackPic_SliggooHisuian[]; +//extern const u32 gMonBackPic_GoodraHisuian[]; +//extern const u32 gMonBackPic_AvaluggHisuian[]; +//extern const u32 gMonBackPic_DecidueyeHisuian[]; extern const u32 gMonBackPic_PikachuCosplay[]; extern const u32 gMonBackPic_PikachuRockStar[]; extern const u32 gMonBackPic_PikachuBelle[]; @@ -2248,9 +2300,12 @@ extern const u32 gMonBackPic_RotomWash[]; extern const u32 gMonBackPic_RotomFrost[]; extern const u32 gMonBackPic_RotomFan[]; extern const u32 gMonBackPic_RotomMow[]; +//extern const u32 gMonBackPic_DialgaOrigin[]; +//extern const u32 gMonBackPic_PalkiaOrigin[]; extern const u32 gMonBackPic_GiratinaOrigin[]; extern const u32 gMonBackPic_ShayminSky[]; extern const u32 gMonBackPic_BasculinBlueStriped[]; +//extern const u32 gMonBackPic_BasculinWhiteStriped[]; extern const u32 gMonBackPic_DarmanitanZenMode[]; extern const u32 gMonBackPic_DarmanitanZenModeGalarian[]; extern const u32 gMonBackPic_SawsbuckSummer[]; @@ -2259,6 +2314,7 @@ extern const u32 gMonBackPic_SawsbuckWinter[]; extern const u32 gMonBackPic_TornadusTherian[]; extern const u32 gMonBackPic_ThundurusTherian[]; extern const u32 gMonBackPic_LandorusTherian[]; +//extern const u32 gMonBackPic_EnamorusTherian[]; extern const u32 gMonBackPic_KyuremWhite[]; extern const u32 gMonBackPic_KyuremBlack[]; extern const u32 gMonBackPic_KeldeoResolute[]; @@ -3245,6 +3301,14 @@ extern const u32 gMonPalette_Regidrago[]; extern const u32 gMonPalette_Glastrier[]; extern const u32 gMonPalette_Spectrier[]; extern const u32 gMonPalette_Calyrex[]; +//extern const u32 gMonPalette_Wyrdeer[]; +//extern const u32 gMonPalette_Kleavor[]; +//extern const u32 gMonPalette_Ursaluna[]; +//extern const u32 gMonPalette_Basculegion[]; +//extern const u32 gMonPalette_BasculegionF[]; +//extern const u32 gMonPalette_Sneasler[]; +//extern const u32 gMonPalette_Overqwil[]; +//extern const u32 gMonPalette_Enamorus[]; extern const u32 gMonPalette_VenusaurMega[]; extern const u32 gMonPalette_CharizardMegaX[]; extern const u32 gMonPalette_CharizardMegaY[]; @@ -3332,6 +3396,22 @@ extern const u32 gMonPalette_DarumakaGalarian[]; extern const u32 gMonPalette_DarmanitanGalarian[]; extern const u32 gMonPalette_YamaskGalarian[]; extern const u32 gMonPalette_StunfiskGalarian[]; +//extern const u32 gMonPalette_GrowlitheHisuian[]; +//extern const u32 gMonPalette_ArcanineHisuian[]; +//extern const u32 gMonPalette_VoltorbHisuian[]; +//extern const u32 gMonPalette_ElectrodeHisuian[]; +//extern const u32 gMonPalette_TyphlosionHisuian[]; +//extern const u32 gMonPalette_QwilfishHisuian[]; +//extern const u32 gMonPalette_SneaselHisuian[]; +//extern const u32 gMonPalette_SamurottHisuian[]; +//extern const u32 gMonPalette_LilligantHisuian[]; +//extern const u32 gMonPalette_ZoruaHisuian[]; +//extern const u32 gMonPalette_ZoroarkHisuian[]; +//extern const u32 gMonPalette_BraviaryHisuian[]; +//extern const u32 gMonPalette_SliggooHisuian[]; +//extern const u32 gMonPalette_GoodraHisuian[]; +//extern const u32 gMonPalette_AvaluggHisuian[]; +//extern const u32 gMonPalette_DecidueyeHisuian[]; extern const u32 gMonPalette_PikachuCosplay[]; extern const u32 gMonPalette_PikachuRockStar[]; extern const u32 gMonPalette_PikachuBelle[]; @@ -3365,6 +3445,8 @@ extern const u32 gMonPalette_RotomWash[]; extern const u32 gMonPalette_RotomFrost[]; extern const u32 gMonPalette_RotomFan[]; extern const u32 gMonPalette_RotomMow[]; +//extern const u32 gMonPalette_DialgaOrigin[]; +//extern const u32 gMonPalette_PalkiaOrigin[]; extern const u32 gMonPalette_GiratinaOrigin[]; extern const u32 gMonPalette_ShayminSky[]; extern const u32 gMonPalette_ArceusFighting[]; @@ -3385,6 +3467,7 @@ extern const u32 gMonPalette_ArceusDragon[]; extern const u32 gMonPalette_ArceusDark[]; extern const u32 gMonPalette_ArceusFairy[]; extern const u32 gMonPalette_BasculinBlueStriped[]; +//extern const u32 gMonPalette_BasculinWhiteStriped[]; extern const u32 gMonPalette_DarmanitanZenMode[]; extern const u32 gMonPalette_DarmanitanZenModeGalarian[]; extern const u32 gMonPalette_DeerlingSummer[]; @@ -3396,6 +3479,7 @@ extern const u32 gMonPalette_SawsbuckWinter[]; extern const u32 gMonPalette_TornadusTherian[]; extern const u32 gMonPalette_ThundurusTherian[]; extern const u32 gMonPalette_LandorusTherian[]; +//extern const u32 gMonPalette_EnamorusTherian[]; extern const u32 gMonPalette_KyuremWhite[]; extern const u32 gMonPalette_KyuremBlack[]; extern const u32 gMonPalette_KeldeoResolute[]; @@ -4417,6 +4501,14 @@ extern const u32 gMonShinyPalette_Regidrago[]; extern const u32 gMonShinyPalette_Glastrier[]; extern const u32 gMonShinyPalette_Spectrier[]; extern const u32 gMonShinyPalette_Calyrex[]; +//extern const u32 gMonShinyPalette_Wyrdeer[]; +//extern const u32 gMonShinyPalette_Kleavor[]; +//extern const u32 gMonShinyPalette_Ursaluna[]; +//extern const u32 gMonShinyPalette_Basculegion[]; +//extern const u32 gMonShinyPalette_BasculegionF[]; +//extern const u32 gMonShinyPalette_Sneasler[]; +//extern const u32 gMonShinyPalette_Overqwil[]; +//extern const u32 gMonShinyPalette_Enamorus[]; extern const u32 gMonShinyPalette_VenusaurMega[]; extern const u32 gMonShinyPalette_CharizardMegaX[]; extern const u32 gMonShinyPalette_CharizardMegaY[]; @@ -4504,6 +4596,22 @@ extern const u32 gMonShinyPalette_DarumakaGalarian[]; extern const u32 gMonShinyPalette_DarmanitanGalarian[]; extern const u32 gMonShinyPalette_YamaskGalarian[]; extern const u32 gMonShinyPalette_StunfiskGalarian[]; +//extern const u32 gMonShinyPalette_GrowlitheHisuian[]; +//extern const u32 gMonShinyPalette_ArcanineHisuian[]; +//extern const u32 gMonShinyPalette_VoltorbHisuian[]; +//extern const u32 gMonShinyPalette_ElectrodeHisuian[]; +//extern const u32 gMonShinyPalette_TyphlosionHisuian[]; +//extern const u32 gMonShinyPalette_QwilfishHisuian[]; +//extern const u32 gMonShinyPalette_SneaselHisuian[]; +//extern const u32 gMonShinyPalette_SamurottHisuian[]; +//extern const u32 gMonShinyPalette_LilligantHisuian[]; +//extern const u32 gMonShinyPalette_ZoruaHisuian[]; +//extern const u32 gMonShinyPalette_ZoroarkHisuian[]; +//extern const u32 gMonShinyPalette_BraviaryHisuian[]; +//extern const u32 gMonShinyPalette_SliggooHisuian[]; +//extern const u32 gMonShinyPalette_GoodraHisuian[]; +//extern const u32 gMonShinyPalette_AvaluggHisuian[]; +//extern const u32 gMonShinyPalette_DecidueyeHisuian[]; extern const u32 gMonShinyPalette_PikachuCosplay[]; extern const u32 gMonShinyPalette_PikachuRockStar[]; extern const u32 gMonShinyPalette_PikachuBelle[]; @@ -4537,6 +4645,8 @@ extern const u32 gMonShinyPalette_RotomWash[]; extern const u32 gMonShinyPalette_RotomFrost[]; extern const u32 gMonShinyPalette_RotomFan[]; extern const u32 gMonShinyPalette_RotomMow[]; +//extern const u32 gMonShinyPalette_DialgaOrigin[]; +//extern const u32 gMonShinyPalette_PalkiaOrigin[]; extern const u32 gMonShinyPalette_GiratinaOrigin[]; extern const u32 gMonShinyPalette_ShayminSky[]; extern const u32 gMonShinyPalette_ArceusFighting[]; @@ -4557,6 +4667,7 @@ extern const u32 gMonShinyPalette_ArceusDragon[]; extern const u32 gMonShinyPalette_ArceusDark[]; extern const u32 gMonShinyPalette_ArceusFairy[]; extern const u32 gMonShinyPalette_BasculinBlueStriped[]; +//extern const u32 gMonShinyPalette_BasculinWhiteStriped[]; extern const u32 gMonShinyPalette_DarmanitanZenMode[]; extern const u32 gMonShinyPalette_DarmanitanZenModeGalarian[]; extern const u32 gMonShinyPalette_DeerlingSummer[]; @@ -4568,6 +4679,7 @@ extern const u32 gMonShinyPalette_SawsbuckWinter[]; extern const u32 gMonShinyPalette_TornadusTherian[]; extern const u32 gMonShinyPalette_ThundurusTherian[]; extern const u32 gMonShinyPalette_LandorusTherian[]; +//extern const u32 gMonShinyPalette_EnamorusTherian[]; extern const u32 gMonShinyPalette_KyuremWhite[]; extern const u32 gMonShinyPalette_KyuremBlack[]; extern const u32 gMonShinyPalette_KeldeoResolute[]; @@ -5577,7 +5689,15 @@ extern const u8 gMonIcon_Regieleki[]; extern const u8 gMonIcon_Regidrago[]; extern const u8 gMonIcon_Glastrier[]; extern const u8 gMonIcon_Spectrier[]; -//extern const u8 gMonIcon_Calyrex[]; +extern const u8 gMonIcon_Calyrex[]; +extern const u8 gMonIcon_Wyrdeer[]; +extern const u8 gMonIcon_Kleavor[]; +extern const u8 gMonIcon_Ursaluna[]; +extern const u8 gMonIcon_Basculegion[]; +extern const u8 gMonIcon_BasculegionF[]; +extern const u8 gMonIcon_Sneasler[]; +extern const u8 gMonIcon_Overqwil[]; +extern const u8 gMonIcon_Enamorus[]; extern const u8 gMonIcon_VenusaurMega[]; extern const u8 gMonIcon_CharizardMegaX[]; extern const u8 gMonIcon_CharizardMegaY[]; @@ -5665,6 +5785,22 @@ extern const u8 gMonIcon_DarumakaGalarian[]; extern const u8 gMonIcon_DarmanitanGalarian[]; extern const u8 gMonIcon_YamaskGalarian[]; extern const u8 gMonIcon_StunfiskGalarian[]; +extern const u8 gMonIcon_GrowlitheHisuian[]; +extern const u8 gMonIcon_ArcanineHisuian[]; +extern const u8 gMonIcon_VoltorbHisuian[]; +extern const u8 gMonIcon_ElectrodeHisuian[]; +extern const u8 gMonIcon_TyphlosionHisuian[]; +extern const u8 gMonIcon_QwilfishHisuian[]; +extern const u8 gMonIcon_SneaselHisuian[]; +extern const u8 gMonIcon_SamurottHisuian[]; +extern const u8 gMonIcon_LilligantHisuian[]; +extern const u8 gMonIcon_ZoruaHisuian[]; +extern const u8 gMonIcon_ZoroarkHisuian[]; +extern const u8 gMonIcon_BraviaryHisuian[]; +extern const u8 gMonIcon_SliggooHisuian[]; +extern const u8 gMonIcon_GoodraHisuian[]; +extern const u8 gMonIcon_AvaluggHisuian[]; +extern const u8 gMonIcon_DecidueyeHisuian[]; extern const u8 gMonIcon_PikachuCosplay[]; extern const u8 gMonIcon_PikachuRockStar[]; extern const u8 gMonIcon_PikachuBelle[]; @@ -5724,9 +5860,12 @@ extern const u8 gMonIcon_RotomWash[]; extern const u8 gMonIcon_RotomFrost[]; extern const u8 gMonIcon_RotomFan[]; extern const u8 gMonIcon_RotomMow[]; +extern const u8 gMonIcon_DialgaOrigin[]; +extern const u8 gMonIcon_PalkiaOrigin[]; extern const u8 gMonIcon_GiratinaOrigin[]; extern const u8 gMonIcon_ShayminSky[]; extern const u8 gMonIcon_BasculinBlueStriped[]; +extern const u8 gMonIcon_BasculinWhiteStriped[]; extern const u8 gMonIcon_DarmanitanZenMode[]; extern const u8 gMonIcon_DarmanitanZenModeGalarian[]; extern const u8 gMonIcon_DeerlingSummer[]; @@ -5738,6 +5877,7 @@ extern const u8 gMonIcon_SawsbuckWinter[]; extern const u8 gMonIcon_TornadusTherian[]; extern const u8 gMonIcon_ThundurusTherian[]; extern const u8 gMonIcon_LandorusTherian[]; +extern const u8 gMonIcon_EnamorusTherian[]; extern const u8 gMonIcon_KyuremWhite[]; extern const u8 gMonIcon_KyuremBlack[]; extern const u8 gMonIcon_KeldeoResolute[]; @@ -6729,6 +6869,13 @@ extern const u8 gMonFootprint_Regidrago[]; extern const u8 gMonFootprint_Glastrier[]; extern const u8 gMonFootprint_Spectrier[]; extern const u8 gMonFootprint_Calyrex[]; +//extern const u8 gMonFootprint_Wyrdeer[]; +//extern const u8 gMonFootprint_Kleavor[]; +//extern const u8 gMonFootprint_Ursaluna[]; +//extern const u8 gMonFootprint_Basculegion[]; +//extern const u8 gMonFootprint_Sneasler[]; +//extern const u8 gMonFootprint_Overqwil[]; +//extern const u8 gMonFootprint_Enamorus[]; // trainer sprites extern const u32 gTrainerFrontPic_Hiker[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index d1b33a637e..5505c73212 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -898,6 +898,13 @@ gCryTable:: cry Cry_Glastrier cry Cry_Spectrier cry Cry_Calyrex + cry Cry_Bulbasaur //Cry_Wyrdeer + cry Cry_Bulbasaur //Cry_Kleavor + cry Cry_Bulbasaur //Cry_Ursaluna + cry Cry_Bulbasaur //Cry_Basculegion + cry Cry_Bulbasaur //Cry_Sneasler + cry Cry_Bulbasaur //Cry_Overqwil + cry Cry_Bulbasaur //Cry_Enamorus @ Megas cry Cry_VenusaurMega cry Cry_CharizardMegaX @@ -989,6 +996,23 @@ gCryTable:: cry Cry_Darmanitan cry Cry_Yamask cry Cry_Stunfisk + @ Hisuian Forms + cry Cry_Growlithe + cry Cry_Arcanine + cry Cry_Voltorb + cry Cry_Electrode + cry Cry_Typhlosion + cry Cry_Qwilfish + cry Cry_Sneasel + cry Cry_Samurott + cry Cry_Lilligant + cry Cry_Zorua + cry Cry_Zoroark + cry Cry_Braviary + cry Cry_Sliggoo + cry Cry_Goodra + cry Cry_Avalugg + cry Cry_Decidueye @ Misc Forms @ Cosplay Pikachu cry Cry_Pikachu @@ -1062,7 +1086,9 @@ gCryTable:: cry Cry_Rotom cry Cry_Rotom cry Cry_Rotom - @ Giratina + @ Origin Forme + cry Cry_Dialga + cry Cry_Palkia cry Cry_Giratina @ Shaymin cry Cry_ShayminSky @@ -1086,6 +1112,7 @@ gCryTable:: cry Cry_Arceus @ Basculin cry Cry_Basculin + cry Cry_Basculin @ Darmanitan cry Cry_Darmanitan cry Cry_Darmanitan @@ -2172,6 +2199,13 @@ gCryTable_Reverse:: cry_reverse Cry_Glastrier cry_reverse Cry_Spectrier cry_reverse Cry_Calyrex + cry_reverse Cry_Bulbasaur //Cry_Wyrdeer + cry_reverse Cry_Bulbasaur //Cry_Kleavor + cry_reverse Cry_Bulbasaur //Cry_Ursaluna + cry_reverse Cry_Bulbasaur //Cry_Basculegion + cry_reverse Cry_Bulbasaur //Cry_Sneasler + cry_reverse Cry_Bulbasaur //Cry_Overqwil + cry_reverse Cry_Bulbasaur //Cry_Enamorus @ Megas cry_reverse Cry_VenusaurMega cry_reverse Cry_CharizardMegaX @@ -2263,6 +2297,23 @@ gCryTable_Reverse:: cry_reverse Cry_Darmanitan cry_reverse Cry_Yamask cry_reverse Cry_Stunfisk + @ Hisuian Forms + cry_reverse Cry_Growlithe + cry_reverse Cry_Arcanine + cry_reverse Cry_Voltorb + cry_reverse Cry_Electrode + cry_reverse Cry_Typhlosion + cry_reverse Cry_Qwilfish + cry_reverse Cry_Sneasel + cry_reverse Cry_Samurott + cry_reverse Cry_Lilligant + cry_reverse Cry_Zorua + cry_reverse Cry_Zoroark + cry_reverse Cry_Braviary + cry_reverse Cry_Sliggoo + cry_reverse Cry_Goodra + cry_reverse Cry_Avalugg + cry_reverse Cry_Decidueye @ Misc Forms @ Cosplay Pikachu cry_reverse Cry_Pikachu @@ -2336,7 +2387,9 @@ gCryTable_Reverse:: cry_reverse Cry_Rotom cry_reverse Cry_Rotom cry_reverse Cry_Rotom - @ Giratina + @ Origin Forme + cry_reverse Cry_Dialga + cry_reverse Cry_Palkia cry_reverse Cry_Giratina @ Shaymin cry_reverse Cry_ShayminSky @@ -2360,6 +2413,7 @@ gCryTable_Reverse:: cry_reverse Cry_Arceus @ Basculin cry_reverse Cry_Basculin + cry_reverse Cry_Basculin @ Darmanitan cry_reverse Cry_Darmanitan cry_reverse Cry_Darmanitan @@ -2375,6 +2429,7 @@ gCryTable_Reverse:: cry_reverse Cry_TornadusTherian cry_reverse Cry_ThundurusTherian cry_reverse Cry_LandorusTherian + cry_reverse Cry_Bulbasaur //Cry_EnamorusTherian @ Kyurem cry_reverse Cry_KyuremWhite cry_reverse Cry_KyuremBlack diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index bddd27423d..6ec747940b 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -3977,6 +3977,35 @@ Cry_Spectrier:: .align 2 Cry_Calyrex:: .incbin "sound/direct_sound_samples/cries/calyrex.bin" +/* + .align 2 +Cry_Wyrdeer:: + .incbin "sound/direct_sound_samples/cries/wyrdeer.bin" + + .align 2 +Cry_Kleavor:: + .incbin "sound/direct_sound_samples/cries/kleavor.bin" + + .align 2 +Cry_Ursaluna:: + .incbin "sound/direct_sound_samples/cries/ursaluna.bin" + + .align 2 +Cry_Basculegion:: + .incbin "sound/direct_sound_samples/cries/basculegion.bin" + + .align 2 +Cry_Sneasler:: + .incbin "sound/direct_sound_samples/cries/sneasler.bin" + + .align 2 +Cry_Overqwil:: + .incbin "sound/direct_sound_samples/cries/overqwil.bin" + + .align 2 +Cry_Enamorus:: + .incbin "sound/direct_sound_samples/cries/enamorus.bin" +*/ .align 2 Cry_VenusaurMega:: @@ -4197,6 +4226,11 @@ Cry_ThundurusTherian:: .align 2 Cry_LandorusTherian:: .incbin "sound/direct_sound_samples/cries/landorus_therian.bin" +/* + .align 2 +Cry_EnamorusTherian:: + .incbin "sound/direct_sound_samples/cries/enamorus_therian.bin" +*/ .align 2 Cry_KyuremWhite:: diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 05332ea459..78aa7ee876 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -912,6 +912,14 @@ const u32 gMonFrontPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/fron const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/front.4bpp.lz"); const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz"); +//const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); +//const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); +//const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); +//const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); +//const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz"); +//const u32 gMonFrontPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/front.4bpp.lz"); +//const u32 gMonFrontPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/front.4bpp.lz"); +//const u32 gMonFrontPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz"); const u32 gMonFrontPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/front.4bpp.lz"); const u32 gMonFrontPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/front.4bpp.lz"); @@ -999,6 +1007,22 @@ const u32 gMonFrontPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumak const u32 gMonFrontPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/front.4bpp.lz"); const u32 gMonFrontPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/front.4bpp.lz"); const u32 gMonFrontPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/front.4bpp.lz"); +//const u32 gMonFrontPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/front.4bpp.lz"); +//const u32 gMonFrontPic_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/front.4bpp.lz"); const u32 gMonFrontPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/front.4bpp.lz"); const u32 gMonFrontPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/front.4bpp.lz"); const u32 gMonFrontPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/front.4bpp.lz"); @@ -1059,9 +1083,12 @@ const u32 gMonFrontPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/ani const u32 gMonFrontPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/anim_front.4bpp.lz"); const u32 gMonFrontPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/anim_front.4bpp.lz"); const u32 gMonFrontPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/anim_front.4bpp.lz"); +//const u32 gMonFrontPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/front.4bpp.lz"); +//const u32 gMonFrontPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/front.4bpp.lz"); const u32 gMonFrontPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/anim_front.4bpp.lz"); const u32 gMonFrontPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/anim_front.4bpp.lz"); const u32 gMonFrontPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/front.4bpp.lz"); +//const u32 gMonFrontPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/front.4bpp.lz"); const u32 gMonFrontPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/anim_front.4bpp.lz"); const u32 gMonFrontPic_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/front.4bpp.lz"); const u32 gMonFrontPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/front.4bpp.lz"); @@ -1070,6 +1097,7 @@ const u32 gMonFrontPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/ const u32 gMonFrontPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/anim_front.4bpp.lz"); const u32 gMonFrontPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/anim_front.4bpp.lz"); const u32 gMonFrontPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/anim_front.4bpp.lz"); +//const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz"); const u32 gMonFrontPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/anim_front.4bpp.lz"); const u32 gMonFrontPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/anim_front.4bpp.lz"); const u32 gMonFrontPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/front.4bpp.lz"); @@ -2064,6 +2092,14 @@ const u32 gMonBackPic_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/back. const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back.4bpp.lz"); const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz"); +//const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); +//const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); +//const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz"); +//const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); +//const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz"); +//const u32 gMonBackPic_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/back.4bpp.lz"); +//const u32 gMonBackPic_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/back.4bpp.lz"); +//const u32 gMonBackPic_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz"); const u32 gMonBackPic_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/back.4bpp.lz"); const u32 gMonBackPic_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/back.4bpp.lz"); @@ -2151,6 +2187,22 @@ const u32 gMonBackPic_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka const u32 gMonBackPic_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/back.4bpp.lz"); const u32 gMonBackPic_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/back.4bpp.lz"); const u32 gMonBackPic_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/back.4bpp.lz"); +//const u32 gMonBackPic_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/back.4bpp.lz"); +//const u32 gMonBackPic_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/back.4bpp.lz"); const u32 gMonBackPic_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/back.4bpp.lz"); const u32 gMonBackPic_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/back.4bpp.lz"); const u32 gMonBackPic_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/back.4bpp.lz"); @@ -2211,9 +2263,12 @@ const u32 gMonBackPic_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/back const u32 gMonBackPic_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/back.4bpp.lz"); const u32 gMonBackPic_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/back.4bpp.lz"); const u32 gMonBackPic_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/back.4bpp.lz"); +//const u32 gMonBackPic_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/back.4bpp.lz"); +//const u32 gMonBackPic_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/back.4bpp.lz"); const u32 gMonBackPic_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/back.4bpp.lz"); const u32 gMonBackPic_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/back.4bpp.lz"); const u32 gMonBackPic_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/back.4bpp.lz"); +//const u32 gMonBackPic_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/back.4bpp.lz"); const u32 gMonBackPic_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/back.4bpp.lz"); const u32 gMonBackPic_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/back.4bpp.lz"); const u32 gMonBackPic_SawsbuckSummer[] = INCBIN_U32("graphics/pokemon/sawsbuck/summer/back.4bpp.lz"); @@ -2222,6 +2277,7 @@ const u32 gMonBackPic_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w const u32 gMonBackPic_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/back.4bpp.lz"); const u32 gMonBackPic_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/back.4bpp.lz"); const u32 gMonBackPic_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/back.4bpp.lz"); +//const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz"); const u32 gMonBackPic_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/back.4bpp.lz"); const u32 gMonBackPic_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/back.4bpp.lz"); const u32 gMonBackPic_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/back.4bpp.lz"); @@ -3208,6 +3264,14 @@ const u32 gMonPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/norma const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/normal.gbapal.lz"); const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz"); +//const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz"); +//const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz"); +//const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz"); +//const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); +//const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz"); +//const u32 gMonPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/normal.gbapal.lz"); +//const u32 gMonPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/normal.gbapal.lz"); +//const u32 gMonPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz"); const u32 gMonPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/normal.gbapal.lz"); const u32 gMonPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/normal.gbapal.lz"); @@ -3295,6 +3359,22 @@ const u32 gMonPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/darumaka const u32 gMonPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/normal.gbapal.lz"); const u32 gMonPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/normal.gbapal.lz"); const u32 gMonPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/normal.gbapal.lz"); +//const u32 gMonPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/normal.gbapal.lz"); +//const u32 gMonPalette_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/normal.gbapal.lz"); const u32 gMonPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/normal.gbapal.lz"); const u32 gMonPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/normal.gbapal.lz"); const u32 gMonPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/normal.gbapal.lz"); @@ -3328,6 +3408,8 @@ const u32 gMonPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash/norm const u32 gMonPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/normal.gbapal.lz"); const u32 gMonPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/normal.gbapal.lz"); const u32 gMonPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/normal.gbapal.lz"); +//const u32 gMonPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/normal.gbapal.lz"); +//const u32 gMonPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/normal.gbapal.lz"); const u32 gMonPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/normal.gbapal.lz"); const u32 gMonPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/normal.gbapal.lz"); const u32 gMonPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/normal.gbapal.lz"); @@ -3348,6 +3430,7 @@ const u32 gMonPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/drago const u32 gMonPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/normal.gbapal.lz"); const u32 gMonPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/normal.gbapal.lz"); const u32 gMonPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/normal.gbapal.lz"); +//const u32 gMonPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/normal.gbapal.lz"); const u32 gMonPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/normal.gbapal.lz"); const u32 gMonPalette_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/normal.gbapal.lz"); const u32 gMonPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/normal.gbapal.lz"); @@ -3359,6 +3442,7 @@ const u32 gMonPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsbuck/w const u32 gMonPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/normal.gbapal.lz"); const u32 gMonPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/normal.gbapal.lz"); const u32 gMonPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/normal.gbapal.lz"); +//const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz"); const u32 gMonPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/normal.gbapal.lz"); const u32 gMonPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/normal.gbapal.lz"); const u32 gMonPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/normal.gbapal.lz"); @@ -4379,6 +4463,14 @@ const u32 gMonShinyPalette_Regidrago[] = INCBIN_U32("graphics/pokemon/regidrago/ const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz"); +//const u32 gMonShinyPalette_Sneasler[] = INCBIN_U32("graphics/pokemon/sneasler/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Overqwil[] = INCBIN_U32("graphics/pokemon/overqwil/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_Enamorus[] = INCBIN_U32("graphics/pokemon/enamorus/shiny.gbapal.lz"); const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/shiny.gbapal.lz"); @@ -4466,6 +4558,22 @@ const u32 gMonShinyPalette_DarumakaGalarian[] = INCBIN_U32("graphics/pokemon/dar const u32 gMonShinyPalette_DarmanitanGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_YamaskGalarian[] = INCBIN_U32("graphics/pokemon/yamask/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_StunfiskGalarian[] = INCBIN_U32("graphics/pokemon/stunfisk/galarian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_GrowlitheHisuian[] = INCBIN_U32("graphics/pokemon/growlithe/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_ArcanineHisuian[] = INCBIN_U32("graphics/pokemon/arcanine/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_VoltorbHisuian[]] = INCBIN_U32("graphics/pokemon/voltorb/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_ElectrodeHisuian[]] = INCBIN_U32("graphics/pokemon/electrode/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_TyphlosionHisuian[]] = INCBIN_U32("graphics/pokemon/typhlosion/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_QwilfishHisuian[]] = INCBIN_U32("graphics/pokemon/qwilfish/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_SneaselHisuian[]] = INCBIN_U32("graphics/pokemon/sneasel/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_SamurottHisuian[]] = INCBIN_U32("graphics/pokemon/samurott/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_LilligantHisuian[]] = INCBIN_U32("graphics/pokemon/lilligant/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_ZoruaHisuian[]] = INCBIN_U32("graphics/pokemon/zorua/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_ZoroarkHisuian[]] = INCBIN_U32("graphics/pokemon/zoroark/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_BraviaryHisuian[]] = INCBIN_U32("graphics/pokemon/braviary/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_SliggooHisuian[]] = INCBIN_U32("graphics/pokemon/sliggoo/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_GoodraHisuian[]] = INCBIN_U32("graphics/pokemon/goodra/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_AvaluggHisuian[]] = INCBIN_U32("graphics/pokemon/avalugg/hisuian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_DecidueyeHisuian[]] = INCBIN_U32("graphics/pokemon/decidueye/hisuian/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuCosplay[] = INCBIN_U32("graphics/pokemon/pikachu/cosplay/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuRockStar[] = INCBIN_U32("graphics/pokemon/pikachu/rock_star/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuBelle[] = INCBIN_U32("graphics/pokemon/pikachu/belle/shiny.gbapal.lz"); @@ -4499,6 +4607,8 @@ const u32 gMonShinyPalette_RotomWash[] = INCBIN_U32("graphics/pokemon/rotom/wash const u32 gMonShinyPalette_RotomFrost[] = INCBIN_U32("graphics/pokemon/rotom/frost/shiny.gbapal.lz"); const u32 gMonShinyPalette_RotomFan[] = INCBIN_U32("graphics/pokemon/rotom/fan/shiny.gbapal.lz"); const u32 gMonShinyPalette_RotomMow[] = INCBIN_U32("graphics/pokemon/rotom/mow/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_DialgaOrigin[] = INCBIN_U32("graphics/pokemon/dialga/origin/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_PalkiaOrigin[] = INCBIN_U32("graphics/pokemon/palkia/origin/shiny.gbapal.lz"); const u32 gMonShinyPalette_GiratinaOrigin[] = INCBIN_U32("graphics/pokemon/giratina/origin/shiny.gbapal.lz"); const u32 gMonShinyPalette_ShayminSky[] = INCBIN_U32("graphics/pokemon/shaymin/sky/shiny.gbapal.lz"); const u32 gMonShinyPalette_ArceusFighting[] = INCBIN_U32("graphics/pokemon/arceus/fighting/shiny.gbapal.lz"); @@ -4519,6 +4629,7 @@ const u32 gMonShinyPalette_ArceusDragon[] = INCBIN_U32("graphics/pokemon/arceus/ const u32 gMonShinyPalette_ArceusDark[] = INCBIN_U32("graphics/pokemon/arceus/dark/shiny.gbapal.lz"); const u32 gMonShinyPalette_ArceusFairy[] = INCBIN_U32("graphics/pokemon/arceus/fairy/shiny.gbapal.lz"); const u32 gMonShinyPalette_BasculinBlueStriped[] = INCBIN_U32("graphics/pokemon/basculin/blue_striped/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_BasculinWhiteStriped[] = INCBIN_U32("graphics/pokemon/basculin/white_striped/shiny.gbapal.lz"); const u32 gMonShinyPalette_DarmanitanZenMode[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/shiny.gbapal.lz"); const u32 gMonShinyPalette_DarmanitanZenModeGalarian[] = INCBIN_U32("graphics/pokemon/darmanitan/zen_mode/galarian/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeerlingSummer[] = INCBIN_U32("graphics/pokemon/deerling/summer/shiny.gbapal.lz"); @@ -4530,6 +4641,7 @@ const u32 gMonShinyPalette_SawsbuckWinter[] = INCBIN_U32("graphics/pokemon/sawsb const u32 gMonShinyPalette_TornadusTherian[] = INCBIN_U32("graphics/pokemon/tornadus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_ThundurusTherian[] = INCBIN_U32("graphics/pokemon/thundurus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_LandorusTherian[] = INCBIN_U32("graphics/pokemon/landorus/therian/shiny.gbapal.lz"); +//const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz"); const u32 gMonShinyPalette_KyuremWhite[] = INCBIN_U32("graphics/pokemon/kyurem/white/shiny.gbapal.lz"); const u32 gMonShinyPalette_KyuremBlack[] = INCBIN_U32("graphics/pokemon/kyurem/black/shiny.gbapal.lz"); const u32 gMonShinyPalette_KeldeoResolute[] = INCBIN_U32("graphics/pokemon/keldeo/resolute/shiny.gbapal.lz"); @@ -5539,7 +5651,15 @@ const u8 gMonIcon_Regieleki[] = INCBIN_U8("graphics/pokemon/regieleki/icon.4bpp" const u8 gMonIcon_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/icon.4bpp"); const u8 gMonIcon_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/icon.4bpp"); const u8 gMonIcon_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/icon.4bpp"); -//const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); +const u8 gMonIcon_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/icon.4bpp"); +const u8 gMonIcon_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/icon.4bpp"); +const u8 gMonIcon_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/icon.4bpp"); +const u8 gMonIcon_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/icon.4bpp"); +const u8 gMonIcon_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/icon.4bpp"); +const u8 gMonIcon_BasculegionF[] = INCBIN_U8("graphics/pokemon/basculegion/iconf.4bpp"); +const u8 gMonIcon_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/icon.4bpp"); +const u8 gMonIcon_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/icon.4bpp"); +const u8 gMonIcon_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/icon.4bpp"); const u8 gMonIcon_VenusaurMega[] = INCBIN_U8("graphics/pokemon/mega_venusaur/icon.4bpp"); const u8 gMonIcon_CharizardMegaX[] = INCBIN_U8("graphics/pokemon/mega_charizard_x/icon.4bpp"); const u8 gMonIcon_CharizardMegaY[] = INCBIN_U8("graphics/pokemon/mega_charizard_y/icon.4bpp"); @@ -5627,6 +5747,22 @@ const u8 gMonIcon_DarumakaGalarian[] = INCBIN_U8("graphics/pokemon/darumaka/gala const u8 gMonIcon_DarmanitanGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/galarian/icon.4bpp"); const u8 gMonIcon_YamaskGalarian[] = INCBIN_U8("graphics/pokemon/yamask/galarian/icon.4bpp"); const u8 gMonIcon_StunfiskGalarian[] = INCBIN_U8("graphics/pokemon/stunfisk/galarian/icon.4bpp"); +const u8 gMonIcon_GrowlitheHisuian[] = INCBIN_U8("graphics/pokemon/growlithe/hisuian/icon.4bpp"); +const u8 gMonIcon_ArcanineHisuian[] = INCBIN_U8("graphics/pokemon/arcanine/hisuian/icon.4bpp"); +const u8 gMonIcon_VoltorbHisuian[] = INCBIN_U8("graphics/pokemon/voltorb/hisuian/icon.4bpp"); +const u8 gMonIcon_ElectrodeHisuian[] = INCBIN_U8("graphics/pokemon/electrode/hisuian/icon.4bpp"); +const u8 gMonIcon_TyphlosionHisuian[] = INCBIN_U8("graphics/pokemon/typhlosion/hisuian/icon.4bpp"); +const u8 gMonIcon_QwilfishHisuian[] = INCBIN_U8("graphics/pokemon/qwilfish/hisuian/icon.4bpp"); +const u8 gMonIcon_SneaselHisuian[] = INCBIN_U8("graphics/pokemon/sneasel/hisuian/icon.4bpp"); +const u8 gMonIcon_SamurottHisuian[] = INCBIN_U8("graphics/pokemon/samurott/hisuian/icon.4bpp"); +const u8 gMonIcon_LilligantHisuian[] = INCBIN_U8("graphics/pokemon/lilligant/hisuian/icon.4bpp"); +const u8 gMonIcon_ZoruaHisuian[] = INCBIN_U8("graphics/pokemon/zorua/hisuian/icon.4bpp"); +const u8 gMonIcon_ZoroarkHisuian[] = INCBIN_U8("graphics/pokemon/zoroark/hisuian/icon.4bpp"); +const u8 gMonIcon_BraviaryHisuian[] = INCBIN_U8("graphics/pokemon/braviary/hisuian/icon.4bpp"); +const u8 gMonIcon_SliggooHisuian[] = INCBIN_U8("graphics/pokemon/sliggoo/hisuian/icon.4bpp"); +const u8 gMonIcon_GoodraHisuian[] = INCBIN_U8("graphics/pokemon/goodra/hisuian/icon.4bpp"); +const u8 gMonIcon_AvaluggHisuian[] = INCBIN_U8("graphics/pokemon/avalugg/hisuian/icon.4bpp"); +const u8 gMonIcon_DecidueyeHisuian[] = INCBIN_U8("graphics/pokemon/decidueye/hisuian/icon.4bpp"); const u8 gMonIcon_PikachuCosplay[] = INCBIN_U8("graphics/pokemon/pikachu/cosplay/icon.4bpp"); const u8 gMonIcon_PikachuRockStar[] = INCBIN_U8("graphics/pokemon/pikachu/rock_star/icon.4bpp"); const u8 gMonIcon_PikachuBelle[] = INCBIN_U8("graphics/pokemon/pikachu/belle/icon.4bpp"); @@ -5686,9 +5822,12 @@ const u8 gMonIcon_RotomWash[] = INCBIN_U8("graphics/pokemon/rotom/wash/icon.4bpp const u8 gMonIcon_RotomFrost[] = INCBIN_U8("graphics/pokemon/rotom/frost/icon.4bpp"); const u8 gMonIcon_RotomFan[] = INCBIN_U8("graphics/pokemon/rotom/fan/icon.4bpp"); const u8 gMonIcon_RotomMow[] = INCBIN_U8("graphics/pokemon/rotom/mow/icon.4bpp"); +const u8 gMonIcon_DialgaOrigin[] = INCBIN_U8("graphics/pokemon/dialga/origin/icon.4bpp"); +const u8 gMonIcon_PalkiaOrigin[] = INCBIN_U8("graphics/pokemon/palkia/origin/icon.4bpp"); const u8 gMonIcon_GiratinaOrigin[] = INCBIN_U8("graphics/pokemon/giratina/origin/icon.4bpp"); const u8 gMonIcon_ShayminSky[] = INCBIN_U8("graphics/pokemon/shaymin/sky/icon.4bpp"); const u8 gMonIcon_BasculinBlueStriped[] = INCBIN_U8("graphics/pokemon/basculin/blue_striped/icon.4bpp"); +const u8 gMonIcon_BasculinWhiteStriped[] = INCBIN_U8("graphics/pokemon/basculin/white_striped/icon.4bpp"); const u8 gMonIcon_DarmanitanZenMode[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/icon.4bpp"); const u8 gMonIcon_DarmanitanZenModeGalarian[] = INCBIN_U8("graphics/pokemon/darmanitan/zen_mode/galarian/icon.4bpp"); const u8 gMonIcon_DeerlingSummer[] = INCBIN_U8("graphics/pokemon/deerling/summer/icon.4bpp"); @@ -5700,6 +5839,7 @@ const u8 gMonIcon_SawsbuckWinter[] = INCBIN_U8("graphics/pokemon/sawsbuck/winter const u8 gMonIcon_TornadusTherian[] = INCBIN_U8("graphics/pokemon/tornadus/therian/icon.4bpp"); const u8 gMonIcon_ThundurusTherian[] = INCBIN_U8("graphics/pokemon/thundurus/therian/icon.4bpp"); const u8 gMonIcon_LandorusTherian[] = INCBIN_U8("graphics/pokemon/landorus/therian/icon.4bpp"); +const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp"); const u8 gMonIcon_KyuremWhite[] = INCBIN_U8("graphics/pokemon/kyurem/white/icon.4bpp"); const u8 gMonIcon_KyuremBlack[] = INCBIN_U8("graphics/pokemon/kyurem/black/icon.4bpp"); const u8 gMonIcon_KeldeoResolute[] = INCBIN_U8("graphics/pokemon/keldeo/resolute/icon.4bpp"); @@ -6691,3 +6831,10 @@ const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footp const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp"); const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp"); const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp"); +//const u8 gMonFootprint_Wyrdeer[] = INCBIN_U8("graphics/pokemon/wyrdeer/footprint.1bpp"); +//const u8 gMonFootprint_Kleavor[] = INCBIN_U8("graphics/pokemon/kleavor/footprint.1bpp"); +//const u8 gMonFootprint_Ursaluna[] = INCBIN_U8("graphics/pokemon/ursaluna/footprint.1bpp"); +//const u8 gMonFootprint_Basculegion[] = INCBIN_U8("graphics/pokemon/basculegion/footprint.1bpp"); +//const u8 gMonFootprint_Sneasler[] = INCBIN_U8("graphics/pokemon/sneasler/footprint.1bpp"); +//const u8 gMonFootprint_Overqwil[] = INCBIN_U8("graphics/pokemon/overqwil/footprint.1bpp"); +//const u8 gMonFootprint_Enamorus[] = INCBIN_U8("graphics/pokemon/enamorus/footprint.1bpp"); diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index cfe6bd0f0b..df2b133a6e 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -22837,6 +22837,177 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, + [SPECIES_WYRDEER] = + { + .baseHP = 103, + .baseAttack = 105, + .baseDefense = 72, + .baseSpeed = 65, + .baseSpAttack = 105, + .baseSpDefense = 75, + .type1 = TYPE_NORMAL, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 184, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_INTIMIDATE, ABILITY_FRISK, ABILITY_SAP_SIPPER}, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_KLEAVOR] = + { + .baseHP = 70, + .baseAttack = 135, + .baseDefense = 95, + .baseSpeed = 85, + .baseSpAttack = 45, + .baseSpDefense = 70, + .type1 = TYPE_BUG, + .type2 = TYPE_ROCK, + .catchRate = 25, + .expYield = 175, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .abilities = {ABILITY_SWARM, ABILITY_SHEER_FORCE, ABILITY_STEADFAST}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_URSALUNA] = + { + .baseHP = 130, + .baseAttack = 140, + .baseDefense = 105, + .baseSpeed = 50, + .baseSpAttack = 45, + .baseSpDefense = 80, + .type1 = TYPE_GROUND, + .type2 = TYPE_NORMAL, + .catchRate = 75, + .expYield = 194, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_GUTS, ABILITY_BULLETPROOF, ABILITY_UNNERVE}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_BASCULEGION] = + { + .baseHP = 120, + .baseAttack = 112, + .baseDefense = 65, + .baseSpeed = 78, + .baseSpAttack = 80, + .baseSpDefense = 75, + .type1 = TYPE_WATER, + .type2 = TYPE_GHOST, + .catchRate = 25, + .expYield = 186, + .evYield_HP = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER}, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + .flags = FLAG_GENDER_DIFFERENCE, + }, + + [SPECIES_SNEASLER] = + { + .baseHP = 80, + .baseAttack = 130, + .baseDefense = 60, + .baseSpeed = 120, + .baseSpAttack = 40, + .baseSpDefense = 80, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_POISON, + .catchRate = 135, + .expYield = 179, + .evYield_Attack = 1, + .evYield_Speed = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_POISON_TOUCH}, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_OVERQWIL] = + { + .baseHP = 85, + .baseAttack = 115, + .baseDefense = 95, + .baseSpeed = 85, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_DARK, + .type2 = TYPE_POISON, + .catchRate = 135, + .expYield = 180, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .abilities = {ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE}, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_ENAMORUS] = + { + .baseHP = 74, + .baseAttack = 115, + .baseDefense = 70, + .baseSpeed = 106, + .baseSpAttack = 135, + .baseSpDefense = 80, + .type1 = TYPE_FAIRY, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 261, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_HEALER, ABILITY_NONE, ABILITY_CONTRARY}, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + .flags = FLAG_LEGENDARY, + }, + [SPECIES_VENUSAUR_MEGA] = { .baseHP = 80, @@ -25022,6 +25193,414 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_GALARIAN_FORM, }, + [SPECIES_GROWLITHE_HISUIAN] = + { + .baseHP = 60, + .baseAttack = 75, + .baseDefense = 45, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 50, + .type1 = TYPE_FIRE, + .type2 = TYPE_ROCK, + .catchRate = 190, + .expYield = 70, + .evYield_Attack = 1, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_ARCANINE_HISUIAN] = + { + .baseHP = 95, + .baseAttack = 115, + .baseDefense = 80, + .baseSpeed = 90, + .baseSpAttack = 95, + .baseSpDefense = 80, + .type1 = TYPE_FIRE, + .type2 = TYPE_ROCK, + .catchRate = 75, + .expYield = 194, + .evYield_Attack = 2, + .genderRatio = PERCENT_FEMALE(25), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_INTIMIDATE, ABILITY_FLASH_FIRE, ABILITY_JUSTIFIED}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_VOLTORB_HISUIAN] = + { + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 50, + .baseSpeed = 100, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_GRASS, + .catchRate = 190, + .expYield = 66, + .evYield_Speed = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_ELECTRODE_HISUIAN] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 70, + .baseSpAttack = 80, + .baseSpDefense = 80, + .baseSpeed = 150, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_GRASS, + .catchRate = 60, + .expYield = 172, + .evYield_Speed = 2, + .genderRatio = MON_GENDERLESS, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_SOUNDPROOF, ABILITY_STATIC, ABILITY_AFTERMATH}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_TYPHLOSION_HISUIAN] = + { + .baseHP = 73, + .baseAttack = 84, + .baseDefense = 78, + .baseSpeed = 95, + .baseSpAttack = 119, + .baseSpDefense = 85, + .type1 = TYPE_FIRE, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 240, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_BLAZE, ABILITY_NONE, ABILITY_FLASH_FIRE}, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_QWILFISH_HISUIAN] = + { + .baseHP = 65, + .baseAttack = 95, + .baseDefense = 85, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_DARK, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 88, + .evYield_Attack = 1, + .item2 = ITEM_POISON_BARB, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .abilities = {ABILITY_POISON_POINT, ABILITY_SWIFT_SWIM, ABILITY_INTIMIDATE}, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_SNEASEL_HISUIAN] = + { + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 55, + .baseSpeed = 115, + .baseSpAttack = 35, + .baseSpDefense = 75, + .type1 = TYPE_POISON, + .type2 = TYPE_FIGHTING, + .catchRate = 60, + .expYield = 86, + .evYield_Speed = 1, + .item2 = ITEM_QUICK_CLAW, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_INNER_FOCUS, ABILITY_KEEN_EYE, ABILITY_POISON_TOUCH}, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_SAMUROTT_HISUIAN] = + { + .baseHP = 90, + .baseAttack = 108, + .baseDefense = 80, + .baseSpeed = 85, + .baseSpAttack = 100, + .baseSpDefense = 65, + .type1 = TYPE_WATER, + .type2 = TYPE_DARK, + .catchRate = 45, + .expYield = 238, + .evYield_SpAttack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_TORRENT, ABILITY_NONE, ABILITY_SHELL_ARMOR}, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_LILLIGANT_HISUIAN] = + { + .baseHP = 70, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 105, + .baseSpAttack = 50, + .baseSpDefense = 75, + .type1 = TYPE_GRASS, + .type2 = TYPE_FIGHTING, + .catchRate = 75, + .expYield = 168, + .evYield_Attack = 2, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif + .genderRatio = MON_FEMALE, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .abilities = {ABILITY_CHLOROPHYLL, ABILITY_HUSTLE, ABILITY_LEAF_GUARD}, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_ZORUA_HISUIAN] = + { + .baseHP = 35, + .baseAttack = 60, + .baseDefense = 40, + .baseSpeed = 70, + .baseSpAttack = 85, + .baseSpDefense = 40, + .type1 = TYPE_NORMAL, + .type2 = TYPE_GHOST, + .catchRate = 75, + .expYield = 66, + .evYield_SpAttack = 1, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_ILLUSION, ABILITY_NONE}, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_ZOROARK_HISUIAN] = + { + .baseHP = 55, + .baseAttack = 100, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 125, + .baseSpDefense = 60, + .type1 = TYPE_NORMAL, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 179, + .evYield_SpAttack = 2, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .abilities = {ABILITY_ILLUSION, ABILITY_NONE}, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_BRAVIARY_HISUIAN] = + { + .baseHP = 110, + .baseAttack = 83, + .baseDefense = 70, + .baseSpeed = 65, + .baseSpAttack = 112, + .baseSpDefense = 70, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_FLYING, + .catchRate = 60, + .expYield = 179, + .evYield_SpAttack = 2, + .genderRatio = MON_MALE, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .abilities = {ABILITY_KEEN_EYE, ABILITY_SHEER_FORCE, ABILITY_DEFIANT}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_SLIGGOO_HISUIAN] = + { + .baseHP = 58, + .baseAttack = 75, + .baseDefense = 83, + .baseSpeed = 40, + .baseSpAttack = 83, + .baseSpDefense = 113, + .type1 = TYPE_DRAGON, + .type2 = TYPE_STEEL, + .catchRate = 45, + .expYield = 158, + .evYield_SpDefense = 2, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_DRAGON, + .abilities = {ABILITY_SAP_SIPPER, ABILITY_OVERCOAT, ABILITY_GOOEY}, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_GOODRA_HISUIAN] = + { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 60, + .baseSpAttack = 110, + .baseSpDefense = 150, + .type1 = TYPE_DRAGON, + .type2 = TYPE_STEEL, + .catchRate = 45, + .expYield = 270, + .evYield_SpDefense = 3, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_DRAGON, + .abilities = {ABILITY_SAP_SIPPER, ABILITY_OVERCOAT, ABILITY_GOOEY}, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_AVALUGG_HISUIAN] = + { + .baseHP = 95, + .baseAttack = 127, + .baseDefense = 184, + .baseSpeed = 38, + .baseSpAttack = 34, + .baseSpDefense = 36, + .type1 = TYPE_ICE, + .type2 = TYPE_ROCK, + .catchRate = 55, + .expYield = 180, + .evYield_Defense = 2, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MINERAL, + .abilities = {ABILITY_STRONG_JAW, ABILITY_ICE_BODY, ABILITY_STURDY}, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + + [SPECIES_DECIDUEYE_HISUIAN] = + { + .baseHP = 88, + .baseAttack = 112, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 95, + .baseSpDefense = 95, + .type1 = TYPE_GRASS, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 239, + .evYield_Attack = 3, + .genderRatio = PERCENT_FEMALE(12.5), + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .abilities = {ABILITY_OVERGROW, ABILITY_NONE, ABILITY_LONG_REACH}, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + .flags = FLAG_HISUIAN_FORM, + }, + [SPECIES_PIKACHU_COSPLAY] = COSPLAY_PIKACHU_BASE_STATS(FLIP), [SPECIES_PIKACHU_ROCK_STAR] = COSPLAY_PIKACHU_BASE_STATS(FLIP), [SPECIES_PIKACHU_BELLE] = COSPLAY_PIKACHU_BASE_STATS(NO_FLIP), @@ -25212,6 +25791,56 @@ const struct BaseStats gBaseStats[] = [SPECIES_ROTOM_FAN] = ROTOM_FORM_BASE_STATS(TYPE_FLYING, FLIP), [SPECIES_ROTOM_MOW] = ROTOM_FORM_BASE_STATS(TYPE_GRASS, FLIP), + [SPECIES_DIALGA_ORIGIN] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 120, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 120, + .type1 = TYPE_STEEL, + .type2 = TYPE_DRAGON, + .catchRate = 3, + .expYield = 306, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + .flags = FLAG_LEGENDARY, + }, + + [SPECIES_PALKIA_ORIGIN] = + { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 120, + .baseSpAttack = 150, + .baseSpDefense = 120, + .type1 = TYPE_WATER, + .type2 = TYPE_DRAGON, + .catchRate = 3, + .expYield = 306, + .evYield_SpAttack = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE, ABILITY_TELEPATHY}, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + .flags = FLAG_LEGENDARY, + }, + [SPECIES_GIRATINA_ORIGIN] = { .baseHP = 150, @@ -25305,6 +25934,31 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, + [SPECIES_BASCULIN_WHITE_STRIPED] = + { + .baseHP = 70, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 98, + .baseSpAttack = 80, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 25, + .expYield = 161, + .evYield_Speed = 2, + .item2 = ITEM_DEEP_SEA_SCALE, + .genderRatio = PERCENT_FEMALE(50), + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .abilities = {ABILITY_RATTLED, ABILITY_ADAPTABILITY, ABILITY_MOLD_BREAKER}, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + [SPECIES_DARMANITAN_ZEN_MODE] = { .baseHP = 105, @@ -25437,6 +26091,31 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_LEGENDARY, }, + [SPECIES_ENAMORUS_THERIAN] = + { + .baseHP = 74, + .baseAttack = 115, + .baseDefense = 110, + .baseSpeed = 46, + .baseSpAttack = 135, + .baseSpDefense = 100, + .type1 = TYPE_FAIRY, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 270, + .evYield_SpAttack = 3, + .genderRatio = MON_FEMALE, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_OVERCOAT, ABILITY_NONE}, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + .flags = FLAG_LEGENDARY, + }, + [SPECIES_KYUREM_WHITE] = { .baseHP = 125, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6cd308aa7d..ff592dbe92 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -899,6 +899,13 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_GLASTRIER] = sGlastrierLevelUpLearnset, [SPECIES_SPECTRIER] = sSpectrierLevelUpLearnset, [SPECIES_CALYREX] = sCalyrexLevelUpLearnset, + [SPECIES_WYRDEER] = sWyrdeerLevelUpLearnset, + [SPECIES_KLEAVOR] = sKleavorLevelUpLearnset, + [SPECIES_URSALUNA] = sUrsalunaLevelUpLearnset, + [SPECIES_BASCULEGION] = sBasculegionLevelUpLearnset, + [SPECIES_SNEASLER] = sSneaslerLevelUpLearnset, + [SPECIES_OVERQWIL] = sOverqwilLevelUpLearnset, + [SPECIES_ENAMORUS] = sEnamorusLevelUpLearnset, // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurLevelUpLearnset, [SPECIES_CHARIZARD_MEGA_X] = sCharizardLevelUpLearnset, @@ -990,6 +997,23 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, [SPECIES_YAMASK_GALARIAN] = sYamaskGalarianLevelUpLearnset, [SPECIES_STUNFISK_GALARIAN] = sStunfiskGalarianLevelUpLearnset, + // Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheHisuianLevelUpLearnset, + [SPECIES_ARCANINE_HISUIAN] = sArcanineHisuianLevelUpLearnset, + [SPECIES_VOLTORB_HISUIAN] = sVoltorbHisuianLevelUpLearnset, + [SPECIES_ELECTRODE_HISUIAN] = sElectrodeHisuianLevelUpLearnset, + [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionHisuianLevelUpLearnset, + [SPECIES_QWILFISH_HISUIAN] = sQwilfishHisuianLevelUpLearnset, + [SPECIES_SNEASEL_HISUIAN] = sSneaselHisuianLevelUpLearnset, + [SPECIES_SAMUROTT_HISUIAN] = sSamurottHisuianLevelUpLearnset, + [SPECIES_LILLIGANT_HISUIAN] = sLilligantHisuianLevelUpLearnset, + [SPECIES_ZORUA_HISUIAN] = sZoruaHisuianLevelUpLearnset, + [SPECIES_ZOROARK_HISUIAN] = sZoroarkHisuianLevelUpLearnset, + [SPECIES_BRAVIARY_HISUIAN] = sBraviaryHisuianLevelUpLearnset, + [SPECIES_SLIGGOO_HISUIAN] = sSliggooHisuianLevelUpLearnset, + [SPECIES_GOODRA_HISUIAN] = sGoodraHisuianLevelUpLearnset, + [SPECIES_AVALUGG_HISUIAN] = sAvaluggHisuianLevelUpLearnset, + [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeHisuianLevelUpLearnset, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuLevelUpLearnset, @@ -1063,7 +1087,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ROTOM_FROST] = sRotomLevelUpLearnset, [SPECIES_ROTOM_FAN] = sRotomLevelUpLearnset, [SPECIES_ROTOM_MOW] = sRotomLevelUpLearnset, - // Giratina + // Origin Forme + [SPECIES_DIALGA_ORIGIN] = sDialgaLevelUpLearnset, + [SPECIES_PALKIA_ORIGIN] = sPalkiaLevelUpLearnset, [SPECIES_GIRATINA_ORIGIN] = sGiratinaLevelUpLearnset, // Shaymin [SPECIES_SHAYMIN_SKY] = sShayminSkyLevelUpLearnset, @@ -1087,6 +1113,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ARCEUS_FAIRY] = sArceusLevelUpLearnset, // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinLevelUpLearnset, + [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinLevelUpLearnset, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanLevelUpLearnset, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanGalarianLevelUpLearnset, @@ -1102,6 +1129,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusLevelUpLearnset, [SPECIES_THUNDURUS_THERIAN] = sThundurusLevelUpLearnset, [SPECIES_LANDORUS_THERIAN] = sLandorusLevelUpLearnset, + [SPECIES_ENAMORUS_THERIAN] = sEnamorusLevelUpLearnset, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 8df5886bd2..93e51c6c8b 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -18087,6 +18087,96 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { LEVEL_UP_END }; +static const struct LevelUpMove sWyrdeerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 5, MOVE_CONFUSION), + LEVEL_UP_MOVE( 9, MOVE_HYPNOSIS), + LEVEL_UP_MOVE(15, MOVE_CALM_MIND), + //LEVEL_UP_MOVE(21, MOVE_PSYSHIELD_BASH), + LEVEL_UP_MOVE(29, MOVE_EXTRASENSORY), + //LEVEL_UP_MOVE(37, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sKleavorLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 6, MOVE_SILVER_WIND), + LEVEL_UP_MOVE(11, MOVE_AERIAL_ACE), + LEVEL_UP_MOVE(14, MOVE_DOUBLE_HIT), + //LEVEL_UP_MOVE(14, MOVE_STEALTH_ROCK), + //LEVEL_UP_MOVE(18, MOVE_AIR_SLASH), + LEVEL_UP_MOVE(25, MOVE_SWORDS_DANCE), + //LEVEL_UP_MOVE(29, MOVE_STONE_AXE), + //LEVEL_UP_MOVE(34, MOVE_X_SCISSOR), + //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sUrsalunaLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + //LEVEL_UP_MOVE( 6, MOVE_BABY_DOLL_EYES), + //LEVEL_UP_MOVE(11, MOVE_BULLDOZE), + LEVEL_UP_MOVE(18, MOVE_SLASH), + //LEVEL_UP_MOVE(25, MOVE_PLAY_ROUGH), + //LEVEL_UP_MOVE(34, MOVE_HIGH_HORSEPOWER), + LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(47, MOVE_HEADLONG_RUSH), + LEVEL_UP_END +}; + +static const struct LevelUpMove sBasculegionLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + //LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), + LEVEL_UP_MOVE(11, MOVE_BITE), + LEVEL_UP_MOVE(11, MOVE_HEX), + //LEVEL_UP_MOVE(18, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(25, MOVE_CRUNCH), + LEVEL_UP_MOVE(25, MOVE_SHADOW_BALL), + //LEVEL_UP_MOVE(34, MOVE_WAVE_CRASH), + LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sSneaslerLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), + //LEVEL_UP_MOVE(11, MOVE_DIRE_CLAW), + LEVEL_UP_MOVE(11, MOVE_SWIFT), + LEVEL_UP_MOVE(18, MOVE_SLASH), + //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), + LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), + //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sOverqwilLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_POISON_STING), + LEVEL_UP_MOVE( 5, MOVE_SPIKES), + LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), + //LEVEL_UP_MOVE(15, MOVE_BARB_BARRAGE), + LEVEL_UP_MOVE(21, MOVE_WATER_PULSE), + //LEVEL_UP_MOVE(26, MOVE_DARK_PULSE), + //LEVEL_UP_MOVE(29, MOVE_POISON_JAB), + //LEVEL_UP_MOVE(37, MOVE_AQUA_TAIL, + LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(57, MOVE_SELF_DESTRUCT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sEnamorusLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 7, MOVE_BITE), + LEVEL_UP_MOVE(11, MOVE_TWISTER), + //LEVEL_UP_MOVE(14, MOVE_DRAINING_KISS), + LEVEL_UP_MOVE(22, MOVE_IRON_DEFENSE), + LEVEL_UP_MOVE(31, MOVE_EXTRASENSORY), + LEVEL_UP_MOVE(41, MOVE_CRUNCH), + //LEVEL_UP_MOVE(47, MOVE_MOONBLAST), + //LEVEL_UP_MOVE( 1, MOVE_SPRINGTIDE_STORM), + LEVEL_UP_END +}; + static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP), @@ -18841,6 +18931,220 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { LEVEL_UP_END }; +static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 5, MOVE_EMBER), + LEVEL_UP_MOVE( 9, MOVE_BITE), + //LEVEL_UP_MOVE(15, MOVE_FIRE_FANG), + LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE(29, MOVE_CRUNCH), + LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ), + LEVEL_UP_END +}; + +static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 5, MOVE_EMBER), + LEVEL_UP_MOVE( 9, MOVE_BITE), + //LEVEL_UP_MOVE(15, MOVE_FIRE_FANG), + LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE(29, MOVE_CRUNCH), + //LEVEL_UP_MOVE(29, MOVE_RAGING_FURY), + LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ), + LEVEL_UP_END +}; + +static const struct LevelUpMove sVoltorbHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 5, MOVE_TACKLE), + LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), + LEVEL_UP_MOVE(15, MOVE_SPARK), + //LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL), + LEVEL_UP_MOVE(29, MOVE_THUNDERBOLT), + LEVEL_UP_MOVE(37, MOVE_THUNDER), + LEVEL_UP_MOVE(47, MOVE_SELF_DESTRUCT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sElectrodeHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK), + LEVEL_UP_MOVE( 5, MOVE_TACKLE), + LEVEL_UP_MOVE( 9, MOVE_THUNDER_WAVE), + LEVEL_UP_MOVE(15, MOVE_SPARK), + //LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL), + LEVEL_UP_MOVE(29, MOVE_THUNDERBOLT), + LEVEL_UP_MOVE(37, MOVE_THUNDER), + //LEVEL_UP_MOVE(47, MOVE_CHLOROBLAST), + LEVEL_UP_MOVE(47, MOVE_SELF_DESTRUCT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sTyphlosionHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 0, MOVE_HEX), + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 6, MOVE_EMBER), + LEVEL_UP_MOVE(11, MOVE_ROLLOUT), + LEVEL_UP_MOVE(18, MOVE_FLAME_WHEEL), + LEVEL_UP_MOVE(25, MOVE_SWIFT), + LEVEL_UP_MOVE(34, MOVE_FLAMETHROWER), + //LEVEL_UP_MOVE(40, MOVE_INFERNAL_PARADE), + LEVEL_UP_MOVE(43, MOVE_OVERHEAT), + LEVEL_UP_MOVE(43, MOVE_SHADOW_BALL), + LEVEL_UP_END +}; + +static const struct LevelUpMove sQwilfishHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_POISON_STING), + LEVEL_UP_MOVE( 5, MOVE_SPIKES), + LEVEL_UP_MOVE( 9, MOVE_PIN_MISSILE), + //LEVEL_UP_MOVE(15, MOVE_BARB_BARRAGE), + LEVEL_UP_MOVE(21, MOVE_WATER_PULSE), + //LEVEL_UP_MOVE(26, MOVE_DARK_PULSE), + //LEVEL_UP_MOVE(29, MOVE_POISON_JAB), + //LEVEL_UP_MOVE(37, MOVE_AQUA_TAIL, + LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(57, MOVE_SELF_DESTRUCT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), + LEVEL_UP_MOVE(11, MOVE_SWIFT), + LEVEL_UP_MOVE(18, MOVE_SLASH), + //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), + LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), + //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sSamurottHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 0, MOVE_NIGHT_SLASH), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + //LEVEL_UP_MOVE( 6, MOVE_AQUA_JET), + LEVEL_UP_MOVE(11, MOVE_SWORDS_DANCE), + LEVEL_UP_MOVE(18, MOVE_WATER_PULSE), + //LEVEL_UP_MOVE(21, MOVE_CEASELESS_EDGE), + LEVEL_UP_MOVE(25, MOVE_SLASH), + //LEVEL_UP_MOVE(34, MOVE_AQUA_TAIL), + //LEVEL_UP_MOVE(40, MOVE_DARK_PULSE), + LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP), + LEVEL_UP_END +}; + +static const struct LevelUpMove sLilligantHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), + LEVEL_UP_MOVE( 1, MOVE_ABSORB), + //LEVEL_UP_MOVE( 5, MOVE_LEAFAGE), + LEVEL_UP_MOVE( 9, MOVE_STUN_SPORE), + LEVEL_UP_MOVE(15, MOVE_POISON_POWDER), + //LEVEL_UP_MOVE(21, MOVE_ENERGY_BALL), + LEVEL_UP_MOVE(29, MOVE_SLEEP_POWDER), + //LEVEL_UP_MOVE(34, MOVE_DRAIN_PUNCH), + LEVEL_UP_MOVE(37, MOVE_LEAF_BLADE), + LEVEL_UP_MOVE(37, MOVE_RECOVER), + //LEVEL_UP_MOVE(42, MOVE_VICTORY_DANCE), + //LEVEL_UP_MOVE(47, MOVE_LEAF_STORM), + LEVEL_UP_MOVE(53, MOVE_PETAL_DANCE), + LEVEL_UP_MOVE(57, MOVE_CLOSE_COMBAT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sZoruaHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), + //LEVEL_UP_MOVE( 6, MOVE_SNARL), + LEVEL_UP_MOVE(11, MOVE_SWIFT), + //LEVEL_UP_MOVE(18, MOVE_BITTER_MALICE), + LEVEL_UP_MOVE(25, MOVE_SLASH), + //LEVEL_UP_MOVE(34, MOVE_SHADOW_CLAW), + //LEVEL_UP_MOVE(43, MOVE_NASTY_PLOT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sZoroarkHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 1, MOVE_SHADOW_SNEAK), + //LEVEL_UP_MOVE( 6, MOVE_SNARL), + LEVEL_UP_MOVE(11, MOVE_SWIFT), + //LEVEL_UP_MOVE(18, MOVE_BITTER_MALICE), + LEVEL_UP_MOVE(25, MOVE_SLASH), + //LEVEL_UP_MOVE(34, MOVE_SHADOW_CLAW), + LEVEL_UP_MOVE(40, MOVE_SHADOW_BALL), + //LEVEL_UP_MOVE(43, MOVE_NASTY_PLOT), + LEVEL_UP_MOVE(52, MOVE_EXTRASENSORY), + LEVEL_UP_END +}; + +static const struct LevelUpMove sBraviaryHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK), + LEVEL_UP_MOVE( 6, MOVE_AERIAL_ACE), + LEVEL_UP_MOVE(11, MOVE_TWISTER), + LEVEL_UP_MOVE(18, MOVE_SLASH), + //LEVEL_UP_MOVE(20, MOVE_AIR_SLASH), + //LEVEL_UP_MOVE(25, MOVE_ESPER_WING), + LEVEL_UP_MOVE(25, MOVE_ROOST), + LEVEL_UP_MOVE(34, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(43, MOVE_BRAVE_BIRD), + //LEVEL_UP_MOVE(52, MOVE_HURRICANE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sSliggooHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), + //LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), + LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), + LEVEL_UP_MOVE(18, MOVE_WATER_PULSE), + //LEVEL_UP_MOVE(25, MOVE_DRAGON_PULSE), + //LEVEL_UP_MOVE(25, MOVE_IRON_HEAD), + //LEVEL_UP_MOVE(34, MOVE_SHELTER), + LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP), + LEVEL_UP_END +}; + +static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), + //LEVEL_UP_MOVE( 6, MOVE_ACID_SPRAY), + LEVEL_UP_MOVE(11, MOVE_ACID_ARMOR), + LEVEL_UP_MOVE(18, MOVE_WATER_PULSE), + //LEVEL_UP_MOVE(25, MOVE_DRAGON_PULSE), + //LEVEL_UP_MOVE(25, MOVE_IRON_HEAD), + //LEVEL_UP_MOVE(34, MOVE_SHELTER), + LEVEL_UP_MOVE(43, MOVE_HYDRO_PUMP), + LEVEL_UP_END +}; + +static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), + //LEVEL_UP_MOVE( 9, MOVE_ICE_SHARD), + LEVEL_UP_MOVE(15, MOVE_BITE), + LEVEL_UP_MOVE(21, MOVE_IRON_DEFENSE), + LEVEL_UP_MOVE(29, MOVE_CRUNCH), + //LEVEL_UP_MOVE(29, MOVE_EARTH_POWER), + LEVEL_UP_MOVE(37, MOVE_BLIZZARD), + //LEVEL_UP_MOVE(37, MOVE_MOUNTAIN_GALE), + LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), + LEVEL_UP_END +}; + +static const struct LevelUpMove sDecidueyeHisuianLevelUpLearnset[] = { + //LEVEL_UP_MOVE( 0, MOVE_ROCK_SMASH), + LEVEL_UP_MOVE( 1, MOVE_GUST), + //LEVEL_UP_MOVE( 6, MOVE_LEAFAGE), + LEVEL_UP_MOVE(11, MOVE_ROOST), + LEVEL_UP_MOVE(18, MOVE_AERIAL_ACE), + LEVEL_UP_MOVE(21, MOVE_MAGICAL_LEAF), + //LEVEL_UP_MOVE(25, MOVE_AIR_SLASH), + //LEVEL_UP_MOVE(30, MOVE_AURA_SPHERE), + LEVEL_UP_MOVE(34, MOVE_LEAF_BLADE), + //LEVEL_UP_MOVE(34, MOVE_TRIPLE_ARROWS), + //LEVEL_UP_MOVE(40, MOVE_BRAVE_BIRD), + //LEVEL_UP_MOVE(43, MOVE_LEAF_STORM), + LEVEL_UP_END +}; + static const struct LevelUpMove sDeoxysAttackLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_WRAP), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 6ceff22eec..e1e6426e30 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -10787,4 +10787,88 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, + + [NATIONAL_DEX_WYRDEER] = + { + .categoryName = _("Big Horn"), + .height = 18, + .weight = 951, + .description = gWyrdeerPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_KLEAVOR] = + { + .categoryName = _("Axe"), + .height = 18, + .weight = 890, + .description = gKleavorPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_URSALUNA] = + { + .categoryName = _("Peat"), + .height = 24, + .weight = 2900, + .description = gUrsalunaPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_BASCULEGION] = + { + .categoryName = _("Big Fish"), + .height = 30, + .weight = 1100, + .description = gBasculegionPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_SNEASLER] = + { + .categoryName = _("Free Climb"), + .height = 13, + .weight = 430, + .description = gSneaslerPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_OVERQWIL] = + { + .categoryName = _("Pin Cluster"), + .height = 25, + .weight = 605, + .description = gOverqwilPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_ENAMORUS] = + { + .categoryName = _("Love-Hate"), + .height = 16, + .weight = 480, + .description = gEnamorusPokedexText, + .pokemonScale = 356, + .pokemonOffset = 17, + .trainerScale = 256, + .trainerOffset = 0, + }, }; diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index f51bdeb445..0ca5ccb417 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -47,6 +47,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_BARBARACLE, NATIONAL_DEX_BARBOACH, NATIONAL_DEX_BARRASKEWDA, + NATIONAL_DEX_BASCULEGION, NATIONAL_DEX_BASCULIN, NATIONAL_DEX_BASTIODON, NATIONAL_DEX_BAYLEEF, @@ -239,6 +240,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_EMBOAR, NATIONAL_DEX_EMOLGA, NATIONAL_DEX_EMPOLEON, + NATIONAL_DEX_ENAMORUS, NATIONAL_DEX_ENTEI, NATIONAL_DEX_ESCAVALIER, NATIONAL_DEX_ESPEON, @@ -403,6 +405,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_KINGLER, NATIONAL_DEX_KIRLIA, NATIONAL_DEX_KLANG, + NATIONAL_DEX_KLEAVOR, NATIONAL_DEX_KLEFKI, NATIONAL_DEX_KLINK, NATIONAL_DEX_KLINKLANG, @@ -562,6 +565,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_ORBEETLE, NATIONAL_DEX_ORICORIO, NATIONAL_DEX_OSHAWOTT, + NATIONAL_DEX_OVERQWIL, NATIONAL_DEX_PACHIRISU, NATIONAL_DEX_PALKIA, @@ -738,6 +742,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_SMEARGLE, NATIONAL_DEX_SMOOCHUM, NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_SNEASLER, NATIONAL_DEX_SNIVY, NATIONAL_DEX_SNOM, NATIONAL_DEX_SNORLAX, @@ -845,6 +850,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_UMBREON, NATIONAL_DEX_UNFEZANT, NATIONAL_DEX_UNOWN, + NATIONAL_DEX_URSALUNA, NATIONAL_DEX_URSARING, NATIONAL_DEX_URSHIFU, NATIONAL_DEX_UXIE, @@ -897,6 +903,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_WORMADAM, NATIONAL_DEX_WURMPLE, NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_WYRDEER, NATIONAL_DEX_XATU, NATIONAL_DEX_XERNEAS, @@ -1248,6 +1255,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GOURGEIST, // Average Size NATIONAL_DEX_MORGREM, NATIONAL_DEX_IVYSAUR, + //NATIONAL_DEX_VOLTORB, //Hisuian Form //NATIONAL_DEX_BANETTE, // Mega NATIONAL_DEX_MIME_JR, NATIONAL_DEX_LAMPENT, @@ -1324,6 +1332,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_QUILAVA, NATIONAL_DEX_BRUXISH, NATIONAL_DEX_STUNKY, + //NATIONAL_DEX_LILLIGANT, // Hisuian Form NATIONAL_DEX_NIDORINO, NATIONAL_DEX_ABRA, NATIONAL_DEX_MACHOP, @@ -1373,6 +1382,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_WARTORTLE, NATIONAL_DEX_LANTURN, NATIONAL_DEX_GOREBYSS, + //NATIONAL_DEX_GROWLITHE, //Hisuian Form NATIONAL_DEX_PRINPLUP, NATIONAL_DEX_CROAGUNK, NATIONAL_DEX_MOTHIM, @@ -1413,6 +1423,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_ESPEON, NATIONAL_DEX_FROSLASS, NATIONAL_DEX_UMBREON, + //NATIONAL_DEX_SNEASEL, //Hisuian Form NATIONAL_DEX_HUNTAIL, NATIONAL_DEX_CARNIVINE, NATIONAL_DEX_WATCHOG, @@ -1516,6 +1527,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_PORYGON, NATIONAL_DEX_DECIDUEYE, NATIONAL_DEX_MIGHTYENA, + //NATIONAL_DEX_DECIDUEYE, //Hisuian Form NATIONAL_DEX_LIEPARD, NATIONAL_DEX_DARUMAKA, NATIONAL_DEX_FEAROW, @@ -1564,6 +1576,8 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_DIGGERSBY, NATIONAL_DEX_GLISCOR, NATIONAL_DEX_DUBWOOL, + NATIONAL_DEX_SNEASLER, + //NATIONAL_DEX_BRAVIARY, //Hisuian Form NATIONAL_DEX_PURUGLY, //NATIONAL_DEX_MANECTRIC, // Mega NATIONAL_DEX_GOTHITELLE, @@ -1586,6 +1600,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_HAKAMO_O, NATIONAL_DEX_ALAKAZAM, NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_ENAMORUS, NATIONAL_DEX_GARDEVOIR, NATIONAL_DEX_KELDEO, NATIONAL_DEX_GRANBULL, @@ -1645,6 +1660,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_HEATMOR, //NATIONAL_DEX_LURANTIS, // Totem-sized //NATIONAL_DEX_ZAPDOS, // Galarian Form + //NATIONAL_DEX_SAMUROTT, // Hisuian Form NATIONAL_DEX_MR_RIME, NATIONAL_DEX_WHIRLIPEDE, //NATIONAL_DEX_PINSIR, // Mega @@ -1661,6 +1677,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_CRADILY, NATIONAL_DEX_BRONZOR, NATIONAL_DEX_MUSHARNA, + NATIONAL_DEX_OVERQWIL, NATIONAL_DEX_DEOXYS, // Normal Forme //NATIONAL_DEX_DEOXYS, // Attack Forme //NATIONAL_DEX_DEOXYS, // Defense Forme @@ -1688,16 +1705,20 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_MAGMORTAR, NATIONAL_DEX_LANDORUS, NATIONAL_DEX_ARMALDO, + //NATIONAL_DEX_SLIGGOO, //Hisuian Form + //NATIONAL_DEX_TYPHLOSION, //Hisuian Form //NATIONAL_DEX_LATIOS, // Mega NATIONAL_DEX_BISHARP, NATIONAL_DEX_SANDYGAST, NATIONAL_DEX_ZARUDE, NATIONAL_DEX_MACHOKE, //NATIONAL_DEX_SLOWBRO, // Galarian Form + //NATIONAL_DEX_ELECTRODE //Hisuian Form NATIONAL_DEX_TREVENANT, NATIONAL_DEX_STANTLER, NATIONAL_DEX_GRUMPIG, NATIONAL_DEX_LARVITAR, + //NATIONAL_DEX_ZOROARK, //Hisuian Form NATIONAL_DEX_CROBAT, NATIONAL_DEX_QUAGSIRE, NATIONAL_DEX_CORVIKNIGHT, @@ -1749,6 +1770,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_FERALIGATR, NATIONAL_DEX_SHARPEDO, NATIONAL_DEX_EISCUE, + NATIONAL_DEX_KLEAVOR, NATIONAL_DEX_SEEL, NATIONAL_DEX_CHESNAUGHT, NATIONAL_DEX_RILLABOOM, @@ -1762,6 +1784,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_SAMUROTT, NATIONAL_DEX_RAPIDASH, NATIONAL_DEX_GARCHOMP, + NATIONAL_DEX_WYRDEER, NATIONAL_DEX_BELDUM, NATIONAL_DEX_BARBARACLE, NATIONAL_DEX_KROOKODILE, @@ -1800,6 +1823,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_FERROTHORN, NATIONAL_DEX_MUDBRAY, NATIONAL_DEX_ZACIAN, // Hero of Many Battles + NATIONAL_DEX_BASCULEGION, //NATIONAL_DEX_CHARIZARD, // Mega X NATIONAL_DEX_SHELGON, //NATIONAL_DEX_SALAMENCE, // Mega @@ -1853,6 +1877,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_HYDREIGON, //NATIONAL_DEX_SABLEYE, // Mega NATIONAL_DEX_MILOTIC, + //NATIONAL_DEX_ARCANINE, //Hisuian Form NATIONAL_DEX_LUNATONE, NATIONAL_DEX_REGICE, NATIONAL_DEX_ARCTOVISH, @@ -1905,8 +1930,10 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GIGALITH, NATIONAL_DEX_BEARTIC, NATIONAL_DEX_TERRAKION, + //NATIONAL_DEX_AVALUGG, //Hisuian Form NATIONAL_DEX_TYRANTRUM, NATIONAL_DEX_RHYPERIOR, + NATIONAL_DEX_URSALUNA, NATIONAL_DEX_MAMOSWINE, // 661.4 - 667.0 lbs / 300.0 - 307.1 kg NATIONAL_DEX_GOLEM, @@ -1923,6 +1950,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GOLURK, NATIONAL_DEX_RESHIRAM, NATIONAL_DEX_BUZZWOLE, + //NATIONAL_DEX_GOODRA, //Hisuian Form NATIONAL_DEX_PALKIA, NATIONAL_DEX_PROBOPASS, NATIONAL_DEX_ZEKROM, @@ -1949,6 +1977,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_METAGROSS, //NATIONAL_DEX_ZYGARDE, // Complete Forme //NATIONAL_DEX_GIRATINA, // Origin Forme + //NATIONAL_DEX_PALKIA, // Origin Form NATIONAL_DEX_DIALGA, //NATIONAL_DEX_STEELIX, // Mega NATIONAL_DEX_GIRATINA, // Altered Forme @@ -1957,6 +1986,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GLASTRIER, //NATIONAL_DEX_CALYREX, // Ice Rider NATIONAL_DEX_STAKATAKA, + //NATIONAL_DEX_DIALGA, // Origin Form NATIONAL_DEX_GUZZLORD, NATIONAL_DEX_MUDSDALE, //NATIONAL_DEX_METAGROSS, // Mega @@ -2155,6 +2185,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_ODDISH, NATIONAL_DEX_MANKEY, NATIONAL_DEX_VOLTORB, + //NATIONAL_DEX_VOLTORB, //Hisuian Form NATIONAL_DEX_KABUTO, NATIONAL_DEX_CYNDAQUIL, NATIONAL_DEX_SPINARAK, @@ -2162,6 +2193,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MURKROW, NATIONAL_DEX_UNOWN, NATIONAL_DEX_QWILFISH, + //NATIONAL_DEX_QWILFISH, //Hisuian Form NATIONAL_DEX_PHANPY, NATIONAL_DEX_TREECKO, NATIONAL_DEX_POOCHYENA, @@ -2340,11 +2372,13 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_DARUMAKA, // Galarian Form NATIONAL_DEX_TIRTOUGA, NATIONAL_DEX_ZORUA, + //NATIONAL_DEX_ZORUA, // Hisuian Form NATIONAL_DEX_GOTHORITA, NATIONAL_DEX_STUNFISK, //NATIONAL_DEX_STUNFISK, // Galarian Form NATIONAL_DEX_QUILLADIN, NATIONAL_DEX_FLETCHINDER, + //NATIONAL_DEX_SLIGGOO, // Hisuian Form //NATIONAL_DEX_GOURGEIST, // Small Size NATIONAL_DEX_DIANCIE, NATIONAL_DEX_DARTRIX, @@ -2421,6 +2455,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_QUILAVA, NATIONAL_DEX_ESPEON, NATIONAL_DEX_SNEASEL, + //NATIONAL_DEX_SNEASEL, //Hisuian Form NATIONAL_DEX_OCTILLERY, NATIONAL_DEX_DELIBIRD, NATIONAL_DEX_GROVYLE, @@ -2572,6 +2607,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_SLOWPOKE, // Galarian Form NATIONAL_DEX_MUK, NATIONAL_DEX_ELECTRODE, + //NATIONAL_DEX_ELECTRODE, //Hisuian Form NATIONAL_DEX_LICKITUNG, NATIONAL_DEX_WEEZING, NATIONAL_DEX_SEADRA, @@ -2606,6 +2642,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_GURDURR, NATIONAL_DEX_LEAVANNY, NATIONAL_DEX_WHIRLIPEDE, + //NATIONAL_DEX_LILLIGANT, //Hisuian Form NATIONAL_DEX_CARRACOSTA, NATIONAL_DEX_FRILLISH, NATIONAL_DEX_ALOMOMOLA, @@ -2660,6 +2697,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DUBWOOL, NATIONAL_DEX_BARRASKEWDA, NATIONAL_DEX_FROSMOTH, + NATIONAL_DEX_SNEASLER, // 4'07" / 1.4m //NATIONAL_DEX_BEEDRILL, // Mega //NATIONAL_DEX_RATICATE, // Alolan Form, Totem-sized @@ -2696,6 +2734,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_ZWEILOUS, //NATIONAL_DEX_TORNADUS, // Therian Forme NATIONAL_DEX_KELDEO, + //NATIONAL_DEX_AVALUGG, // Hisuian Form //NATIONAL_DEX_GUMSHOOS, // Totem-sized NATIONAL_DEX_CINDERACE, NATIONAL_DEX_EISCUE, @@ -2730,6 +2769,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CRESSELIA, NATIONAL_DEX_DARKRAI, NATIONAL_DEX_SAMUROTT, + //NATIONAL_DEX_SAMUROTT, // Hisuian Form //NATIONAL_DEX_AUDINO, // Mega NATIONAL_DEX_CONKELDURR, NATIONAL_DEX_SEISMITOAD, @@ -2765,6 +2805,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_HYPNO, NATIONAL_DEX_ZAPDOS, //NATIONAL_DEX_ZAPDOS, // Galarian Form + //NATIONAL_DEX_TYPHLOSION, // Hisuian Form NATIONAL_DEX_NOCTOWL, NATIONAL_DEX_GARDEVOIR, //NATIONAL_DEX_GARDEVOIR, // Mega @@ -2777,17 +2818,22 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_EMBOAR, NATIONAL_DEX_ZEBSTRIKA, NATIONAL_DEX_ZOROARK, + //NATIONAL_DEX_ZOROARK, // Hisuian Form NATIONAL_DEX_DRUDDIGON, NATIONAL_DEX_BISHARP, NATIONAL_DEX_BOUFFALANT, + //NATIONAL_DEX_BRAVIARY, // Hisuian Form NATIONAL_DEX_VOLCARONA, NATIONAL_DEX_CHESNAUGHT, NATIONAL_DEX_DECIDUEYE, + //NATIONAL_DEX_DECIDUEYE, // Hisuian Form NATIONAL_DEX_KOMMO_O, NATIONAL_DEX_TOXTRICITY, NATIONAL_DEX_GRAPPLOCT, NATIONAL_DEX_OBSTAGOON, NATIONAL_DEX_RUNERIGUS, + NATIONAL_DEX_ENAMORUS, + //NATIONAL_DEX_ENAMORUS, //Therian Form // 5'07" / 1.7m NATIONAL_DEX_CHARIZARD, //NATIONAL_DEX_CHARIZARD, // Mega X @@ -2820,6 +2866,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_COFAGRIGUS, NATIONAL_DEX_GOGOAT, NATIONAL_DEX_AEGISLASH, + //NATIONAL_DEX_GOODRA, //Hisuian Form //NATIONAL_DEX_GOURGEIST, // Super Size NATIONAL_DEX_VOLCANION, NATIONAL_DEX_CRABOMINABLE, @@ -2853,6 +2900,8 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DRACOZOLT, NATIONAL_DEX_DURALUDON, NATIONAL_DEX_ZARUDE, + NATIONAL_DEX_WYRDEER, + NATIONAL_DEX_KLEAVOR, // 6'03" / 1.9m NATIONAL_DEX_ARCANINE, NATIONAL_DEX_RHYDON, @@ -2878,6 +2927,7 @@ const u16 gPokedexOrder_Height[] = // 6'07" / 2.0m NATIONAL_DEX_VENUSAUR, NATIONAL_DEX_EKANS, + //NATIONAL_DEX_ARCANINE, //Hisuian Form //NATIONAL_DEX_SLOWBRO, // Mega NATIONAL_DEX_EXEGGUTOR, NATIONAL_DEX_MOLTRES, @@ -2947,6 +2997,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_NECROZMA, //NATIONAL_DEX_CALYREX, // Ice Rider //NATIONAL_DEX_CALYREX, // Shadow Rider + NATIONAL_DEX_URSALUNA, // 8'02" / 2.5m NATIONAL_DEX_LAPRAS, //NATIONAL_DEX_TYRANITAR, // Mega @@ -2959,6 +3010,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MUDSDALE, NATIONAL_DEX_MELMETAL, NATIONAL_DEX_STONJOURNER, + NATIONAL_DEX_OVERQWIL, // 8'06" / 2.6m NATIONAL_DEX_BEARTIC, //NATIONAL_DEX_VIKAVOLT, // Totem-sized @@ -2985,6 +3037,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_FALINKS, NATIONAL_DEX_COPPERAJAH, NATIONAL_DEX_DRAGAPULT, + NATIONAL_DEX_BASCULEGION, // 10'02" / 3.1m //NATIONAL_DEX_ARAQUANID, // Totem-sized // 10'06" / 3.2m @@ -3034,6 +3087,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_YVELTAL, // 20'04" / 6.2m NATIONAL_DEX_MILOTIC, + //NATIONAL_DEX_PALKIA, //Origin Forme // 21'04" / 6.5m NATIONAL_DEX_GYARADOS, //NATIONAL_DEX_GYARADOS, // Mega @@ -3042,6 +3096,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_GIRATINA, // Origin Forme // 23'00" / 7.0m NATIONAL_DEX_RAYQUAZA, + //NATIONAL_DEX_DIALGA, //Origin Forme // 24'07" / 7.5m //NATIONAL_DEX_NECROZMA, // Ultra // 26'11" / 8.2m diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 15d56ee9d5..b29e9db8ef 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5348,3 +5348,43 @@ const u8 gCalyrexPokedexText[] = _( "providing healing and blessings. It\n" "reigned over the Galar region in times\n" "of yore."); + +const u8 gWyrdeerPokedexText[] = _( + "The black orbs shine with an uncanny light\n" + "when it is erecting invisible barriers.\n" + "The fur shed from its beard retains heat\n" + "and useful for winter clothing."); + +const u8 gKleavorPokedexText[] = _( + "A violent creature that fells trees with\n" + "its crude axes and shields itself with hard\n" + "stone. If one should encounter this Pokémon\n" + "in the wild, one's only recourse is to flee."); + +const u8 gUrsalunaPokedexText[] = _( + "Swampy terrain gives Ursaluna its burly\n" + "physique and newfound capacity to\n" + "manipulate peat at will."); + +const u8 gBasculegionPokedexText[] = _( + "It clads itself in the souls of comrades\n" + "that perishes before their goals of\n" + "journeying upstream."); + +const u8 gSneaslerPokedexText[] = _( + "Because of its wicked poison and daunting\n" + "physical prowess, no other species could\n" + "hope to best it on frozen highlands. It\n" + "prefers solitude and doesn't form packs."); + +const u8 gOverqwilPokedexText[] = _( + "Its lancelike spikes and savage\n" + "temperament have earned it the\n" + "nickname Sea Fiend.\n" + "It surps up poison to nourish itself."); + +const u8 gEnamorusPokedexText[] = _( + "Its arrival brings an end to the\n" + "winter. According to legend, this\n" + "Pokémon's love gives rise to the\n" + "budding of fresh life across the land."); diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index b71192806f..0c91bc25e3 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -20193,6 +20193,20 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLAR_BEAM) | TMHM(TM11_SUNNY_DAY)), + [SPECIES_WYRDEER] = TMHM_LEARNSET(0), + + [SPECIES_KLEAVOR] = TMHM_LEARNSET(0), + + [SPECIES_URSALUNA] = TMHM_LEARNSET(0), + + [SPECIES_BASCULEGION] = TMHM_LEARNSET(0), + + [SPECIES_SNEASLER] = TMHM_LEARNSET(0), + + [SPECIES_OVERQWIL] = TMHM_LEARNSET(0), + + [SPECIES_ENAMORUS] = TMHM_LEARNSET(0), + [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20760,6 +20774,38 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM37_SANDSTORM) | TMHM(TM36_SLUDGE_BOMB) | TMHM(HM03_SURF)), + + [SPECIES_GROWLITHE_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_ARCANINE_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_VOLTORB_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_ELECTRODE_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_TYPHLOSION_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_QWILFISH_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_SNEASEL_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_SAMUROTT_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_LILLIGANT_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_ZORUA_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_ZOROARK_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_BRAVIARY_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_SLIGGOO_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_GOODRA_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_AVALUGG_HISUIAN] = TMHM_LEARNSET(0), + + [SPECIES_DECIDUEYE_HISUIAN] = TMHM_LEARNSET(0), [SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) @@ -21389,6 +21435,78 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_ROTOM_MOW] = TMHM_LEARNSET(0), + [SPECIES_DIALGA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + | TMHM(TM14_BLIZZARD) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM08_BULK_UP) + | TMHM(HM01_CUT) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(HM05_FLASH) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM50_OVERHEAT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM44_REST) + | TMHM(TM27_RETURN) + | TMHM(TM05_ROAR) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM37_SANDSTORM) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(HM04_STRENGTH) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM25_THUNDER) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM06_TOXIC)), + + [SPECIES_PALKIA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + | TMHM(TM14_BLIZZARD) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM08_BULK_UP) + | TMHM(HM01_CUT) + | TMHM(HM08_DIVE) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM42_FACADE) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM44_REST) + | TMHM(TM27_RETURN) + | TMHM(TM05_ROAR) + | TMHM(HM06_ROCK_SMASH) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM37_SANDSTORM) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(HM04_STRENGTH) + | TMHM(TM11_SUNNY_DAY) + | TMHM(HM03_SURF) + | TMHM(TM25_THUNDER) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM06_TOXIC) + | TMHM(TM03_WATER_PULSE)), + [SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -22289,6 +22407,25 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(HM07_WATERFALL)), + [SPECIES_BASCULIN_WHITE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM08_DIVE) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM44_REST) + | TMHM(TM27_RETURN) + | TMHM(TM43_SECRET_POWER) + | TMHM(HM03_SURF) + | TMHM(TM12_TAUNT) + | TMHM(TM06_TOXIC) + | TMHM(HM07_WATERFALL)), + [SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22489,6 +22626,8 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), + [SPECIES_ENAMORUS_THERIAN] = TMHM_LEARNSET(0), + [SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index f6ad5b26e8..26ccbcd9b2 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -10188,6 +10188,20 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), + [SPECIES_WYRDEER] = (0), + + [SPECIES_KLEAVOR] = (0), + + [SPECIES_URSALUNA] = (0), + + [SPECIES_BASCULEGION] = (0), + + [SPECIES_SNEASLER] = (0), + + [SPECIES_OVERQWIL] = (0), + + [SPECIES_ENAMORUS] = (0), + [SPECIES_MEOWTH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10366,6 +10380,38 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), + [SPECIES_GROWLITHE_HISUIAN] = (0), + + [SPECIES_ARCANINE_HISUIAN] = (0), + + [SPECIES_VOLTORB_HISUIAN] = (0), + + [SPECIES_ELECTRODE_HISUIAN] = (0), + + [SPECIES_TYPHLOSION_HISUIAN] = (0), + + [SPECIES_QWILFISH_HISUIAN] = (0), + + [SPECIES_SNEASEL_HISUIAN] = (0), + + [SPECIES_SAMUROTT_HISUIAN] = (0), + + [SPECIES_LILLIGANT_HISUIAN] = (0), + + [SPECIES_ZORUA_HISUIAN] = (0), + + [SPECIES_ZOROARK_HISUIAN] = (0), + + [SPECIES_BRAVIARY_HISUIAN] = (0), + + [SPECIES_SLIGGOO_HISUIAN] = (0), + + [SPECIES_GOODRA_HISUIAN] = (0), + + [SPECIES_AVALUGG_HISUIAN] = (0), + + [SPECIES_DECIDUEYE_HISUIAN] = (0), + [SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), [SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 70baff4b4f..91b77450c3 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4499,6 +4499,41 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(56, 48), .y_offset = 10, }, + [SPECIES_WYRDEER] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_KLEAVOR] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_URSALUNA] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_BASCULEGION] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SNEASLER] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_OVERQWIL] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ENAMORUS] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Megas [SPECIES_VENUSAUR_MEGA] = { @@ -4937,6 +4972,87 @@ const struct MonCoords gMonBackPicCoords[] = { .size = MON_COORDS_SIZE(64, 24), .y_offset = 23, + }, + // Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ARCANINE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_VOLTORB_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ELECTRODE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_TYPHLOSION_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_QWILFISH_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SNEASEL_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SAMUROTT_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_LILLIGANT_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ZORUA_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ZOROARK_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_BRAVIARY_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SLIGGOO_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_GOODRA_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_AVALUGG_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_DECIDUEYE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, }, // Misc Forms // Cosplay Pikachu @@ -5251,7 +5367,17 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(56, 48), .y_offset = 10, }, - // Giratina + // Origin Forme + [SPECIES_DIALGA_ORIGIN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_PALKIA_ORIGIN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 56), @@ -5355,6 +5481,11 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 48), .y_offset = 16, }, + [SPECIES_BASCULIN_WHITE_STRIPED] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { @@ -5414,6 +5545,11 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 7, }, + [SPECIES_ENAMORUS_THERIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Kyurem [SPECIES_KYUREM_WHITE] = { diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 80f7aab3b3..f1f8a3afaf 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -899,6 +899,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(GLASTRIER, gMonBackPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex), + SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer), + SPECIES_SPRITE(KLEAVOR, gMonBackPic_CircledQuestionMark), //gMonBackPic_Kleavor), + SPECIES_SPRITE(URSALUNA, gMonBackPic_CircledQuestionMark), //gMonBackPic_Ursaluna), + SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion), + SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler), + SPECIES_SPRITE(OVERQWIL, gMonBackPic_CircledQuestionMark), //gMonBackPic_Overqwil), + SPECIES_SPRITE(ENAMORUS, gMonBackPic_CircledQuestionMark), //gMonBackPic_Enamorus), SPECIES_SPRITE(VENUSAUR_MEGA, gMonBackPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonBackPic_CharizardMegaX), @@ -991,6 +998,23 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(YAMASK_GALARIAN, gMonBackPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonBackPic_StunfiskGalarian), + SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_GrowlitheHisuian), + SPECIES_SPRITE(ARCANINE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ArcanineHisuian), + SPECIES_SPRITE(VOLTORB_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_VoltorbHisuian), + SPECIES_SPRITE(ELECTRODE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ElectrodeHisuian), + SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_TyphlosionHisuian), + SPECIES_SPRITE(QWILFISH_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_QwilfishHisuian), + SPECIES_SPRITE(SNEASEL_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SneaselHisuian), + SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SamurottHisuian), + SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_LilligantHisuian), + SPECIES_SPRITE(ZORUA_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ZoruaHisuian), + SPECIES_SPRITE(ZOROARK_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_ZoroarkHisuian), + SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_BraviaryHisuian), + SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_SliggooHisuian), + SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_GoodraHisuian), + SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_AvaluggHisuian), + SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DecidueyeHisuian), + SPECIES_SPRITE(PIKACHU_COSPLAY, gMonBackPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonBackPic_PikachuRockStar), SPECIES_SPRITE(PIKACHU_BELLE, gMonBackPic_PikachuBelle), @@ -1063,6 +1087,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ROTOM_FAN, gMonBackPic_RotomFan), SPECIES_SPRITE(ROTOM_MOW, gMonBackPic_RotomMow), + SPECIES_SPRITE(DIALGA_ORIGIN, gMonBackPic_CircledQuestionMark), //gMonBackPic_DialgaOrigin), + SPECIES_SPRITE(PALKIA_ORIGIN, gMonBackPic_CircledQuestionMark), //gMonBackPic_PalkiaOrigin), SPECIES_SPRITE(GIRATINA_ORIGIN, gMonBackPic_GiratinaOrigin), SPECIES_SPRITE(SHAYMIN_SKY, gMonBackPic_ShayminSky), @@ -1086,6 +1112,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(ARCEUS_FAIRY, gMonBackPic_Arceus), SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonBackPic_BasculinBlueStriped), + SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculinWhiteStriped), SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonBackPic_DarmanitanZenMode), SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonBackPic_DarmanitanZenModeGalarian), @@ -1101,6 +1128,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(TORNADUS_THERIAN, gMonBackPic_TornadusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonBackPic_ThundurusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonBackPic_LandorusTherian), + SPECIES_SPRITE(ENAMORUS_THERIAN, gMonBackPic_CircledQuestionMark), //gMonBackPic_EnamorusTherian), SPECIES_SPRITE(KYUREM_WHITE, gMonBackPic_KyuremWhite), SPECIES_SPRITE(KYUREM_BLACK, gMonBackPic_KyuremBlack), @@ -1292,4 +1320,5 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), + SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_BasculegionF), }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 6387994c1a..1e9dc41a8e 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8527,6 +8527,48 @@ static const union AnimCmd sAnim_CALYREX_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_WYRDEER_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_KLEAVOR_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_URSALUNA_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_BASCULEGION_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SNEASLER_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_OVERQWIL_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ENAMORUS_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd sAnim_VENUSAUR_MEGA_1[] = { ANIMCMD_FRAME(0, 1), @@ -9049,12 +9091,120 @@ static const union AnimCmd sAnim_STUNFISK_GALARIAN_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_GROWLITHE_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ARCANINE_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_VOLTORB_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ELECTRODE_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_TYPHLOSION_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_QWILFISH_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SNEASEL_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SAMUROTT_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_LILLIGANT_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ZORUA_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_ZOROARK_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_BRAVIARY_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_SLIGGOO_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_GOODRA_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_AVALUGG_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DECIDUEYE_HISUIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd sAnim_SHAYMIN_SKY_1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +static const union AnimCmd sAnim_DIALGA_ORIGIN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_PALKIA_ORIGIN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd sAnim_GIRATINA_ORIGIN_1[] = { ANIMCMD_FRAME(0, 1), @@ -9091,6 +9241,12 @@ static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_ENAMORUS_THERIAN_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd sAnim_KELDEO_RESOLUTE_1[] = { ANIMCMD_FRAME(0, 1), @@ -14041,6 +14197,41 @@ static const union AnimCmd *const sAnims_CALYREX[] ={ sAnim_CALYREX_1, }; +static const union AnimCmd *const sAnims_WYRDEER[] ={ + sAnim_GeneralFrame0, + sAnim_WYRDEER_1, +}; + +static const union AnimCmd *const sAnims_KLEAVOR[] ={ + sAnim_GeneralFrame0, + sAnim_KLEAVOR_1, +}; + +static const union AnimCmd *const sAnims_URSALUNA[] ={ + sAnim_GeneralFrame0, + sAnim_URSALUNA_1, +}; + +static const union AnimCmd *const sAnims_BASCULEGION[] ={ + sAnim_GeneralFrame0, + sAnim_BASCULEGION_1, +}; + +static const union AnimCmd *const sAnims_SNEASLER[] ={ + sAnim_GeneralFrame0, + sAnim_SNEASLER_1, +}; + +static const union AnimCmd *const sAnims_OVERQWIL[] ={ + sAnim_GeneralFrame0, + sAnim_OVERQWIL_1, +}; + +static const union AnimCmd *const sAnims_ENAMORUS[] ={ + sAnim_GeneralFrame0, + sAnim_ENAMORUS_1, +}; + static const union AnimCmd *const sAnims_VENUSAUR_MEGA[] ={ sAnim_GeneralFrame0, sAnim_VENUSAUR_MEGA_1, @@ -14476,11 +14667,101 @@ static const union AnimCmd *const sAnims_STUNFISK_GALARIAN[] ={ sAnim_STUNFISK_GALARIAN_1, }; +static const union AnimCmd *const sAnims_GROWLITHE_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_GROWLITHE_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_ARCANINE_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ARCANINE_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_VOLTORB_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_VOLTORB_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_ELECTRODE_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ELECTRODE_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_TYPHLOSION_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_TYPHLOSION_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_QWILFISH_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_QWILFISH_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_SNEASEL_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_SNEASEL_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_SAMUROTT_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_SAMUROTT_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_LILLIGANT_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_LILLIGANT_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_ZORUA_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ZORUA_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_ZOROARK_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ZOROARK_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_BRAVIARY_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_BRAVIARY_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_SLIGGOO_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_SLIGGOO_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_GOODRA_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_GOODRA_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_AVALUGG_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_AVALUGG_HISUIAN_1, +}; + +static const union AnimCmd *const sAnims_DECIDUEYE_HISUIAN[] ={ + sAnim_GeneralFrame0, + sAnim_DECIDUEYE_HISUIAN_1, +}; + static const union AnimCmd *const sAnims_SHAYMIN_SKY[] ={ sAnim_GeneralFrame0, sAnim_SHAYMIN_SKY_1, }; +static const union AnimCmd *const sAnims_DIALGA_ORIGIN[] ={ + sAnim_GeneralFrame0, + sAnim_DIALGA_ORIGIN_1, +}; + +static const union AnimCmd *const sAnims_PALKIA_ORIGIN[] ={ + sAnim_GeneralFrame0, + sAnim_PALKIA_ORIGIN_1, +}; + static const union AnimCmd *const sAnims_GIRATINA_ORIGIN[] ={ sAnim_GeneralFrame0, sAnim_GIRATINA_ORIGIN_1, @@ -14511,6 +14792,11 @@ static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] ={ sAnim_LANDORUS_THERIAN_1, }; +static const union AnimCmd *const sAnims_ENAMORUS_THERIAN[] ={ + sAnim_GeneralFrame0, + sAnim_ENAMORUS_THERIAN_1, +}; + static const union AnimCmd *const sAnims_KELDEO_RESOLUTE[] ={ sAnim_GeneralFrame0, sAnim_KELDEO_RESOLUTE_1, @@ -15573,6 +15859,13 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(GLASTRIER), ANIM_CMD(SPECTRIER), ANIM_CMD(CALYREX), + ANIM_CMD(WYRDEER), + ANIM_CMD(KLEAVOR), + ANIM_CMD(URSALUNA), + ANIM_CMD(BASCULEGION), + ANIM_CMD(SNEASLER), + ANIM_CMD(OVERQWIL), + ANIM_CMD(ENAMORUS), ANIM_CMD(VENUSAUR_MEGA), ANIM_CMD(CHARIZARD_MEGA_X), ANIM_CMD(CHARIZARD_MEGA_Y), @@ -15660,6 +15953,22 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DARMANITAN_GALARIAN), ANIM_CMD(YAMASK_GALARIAN), ANIM_CMD(STUNFISK_GALARIAN), + ANIM_CMD(GROWLITHE_HISUIAN), + ANIM_CMD(ARCANINE_HISUIAN), + ANIM_CMD(VOLTORB_HISUIAN), + ANIM_CMD(ELECTRODE_HISUIAN), + ANIM_CMD(TYPHLOSION_HISUIAN), + ANIM_CMD(QWILFISH_HISUIAN), + ANIM_CMD(SNEASEL_HISUIAN), + ANIM_CMD(SAMUROTT_HISUIAN), + ANIM_CMD(LILLIGANT_HISUIAN), + ANIM_CMD(ZORUA_HISUIAN), + ANIM_CMD(ZOROARK_HISUIAN), + ANIM_CMD(BRAVIARY_HISUIAN), + ANIM_CMD(SLIGGOO_HISUIAN), + ANIM_CMD(GOODRA_HISUIAN), + ANIM_CMD(AVALUGG_HISUIAN), + ANIM_CMD(DECIDUEYE_HISUIAN), ANIM_CMD(PIKACHU_COSPLAY), ANIM_CMD(PIKACHU_ROCK_STAR), ANIM_CMD(PIKACHU_BELLE), @@ -15720,6 +16029,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ROTOM_FROST), ANIM_CMD(ROTOM_FAN), ANIM_CMD(ROTOM_MOW), + ANIM_CMD(DIALGA_ORIGIN), + ANIM_CMD(PALKIA_ORIGIN), ANIM_CMD(GIRATINA_ORIGIN), ANIM_CMD(SHAYMIN_SKY), ANIM_CMD_FULL(ARCEUS_FIGHTING, sAnims_ARCEUS), @@ -15740,6 +16051,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ARCEUS_DARK, sAnims_ARCEUS), ANIM_CMD_FULL(ARCEUS_FAIRY, sAnims_ARCEUS), ANIM_CMD_FULL(BASCULIN_BLUE_STRIPED, sAnims_BASCULIN), + ANIM_CMD_FULL(BASCULIN_WHITE_STRIPED, sAnims_BASCULIN), ANIM_CMD(DARMANITAN_ZEN_MODE), ANIM_CMD(DARMANITAN_ZEN_MODE_GALARIAN), ANIM_CMD_FULL(DEERLING_SUMMER, sAnims_DEERLING), @@ -15751,6 +16063,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(TORNADUS_THERIAN), ANIM_CMD(THUNDURUS_THERIAN), ANIM_CMD(LANDORUS_THERIAN), + ANIM_CMD(ENAMORUS_THERIAN), ANIM_CMD(KYUREM_WHITE), ANIM_CMD(KYUREM_BLACK), ANIM_CMD(MELOETTA_PIROUETTE), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 02a0e06135..fd33f6fa39 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4499,6 +4499,41 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(48, 64), .y_offset = 2, }, + [SPECIES_WYRDEER] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_KLEAVOR] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_URSALUNA] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_BASCULEGION] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SNEASLER] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_OVERQWIL] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ENAMORUS] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Megas [SPECIES_VENUSAUR_MEGA] = { @@ -4937,6 +4972,87 @@ const struct MonCoords gMonFrontPicCoords[] = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14, + }, + // Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ARCANINE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_VOLTORB_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ELECTRODE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_TYPHLOSION_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_QWILFISH_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SNEASEL_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SAMUROTT_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_LILLIGANT_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ZORUA_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_ZOROARK_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_BRAVIARY_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_SLIGGOO_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_GOODRA_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_AVALUGG_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_DECIDUEYE_HISUIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, }, // Misc Forms // Cosplay Pikachu @@ -5251,7 +5367,17 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 64), .y_offset = 12, }, - // Giratina + // Origin Forme + [SPECIES_DIALGA_ORIGIN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, + [SPECIES_PALKIA_ORIGIN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, [SPECIES_GIRATINA_ORIGIN] = { .size = MON_COORDS_SIZE(64, 64), @@ -5355,6 +5481,11 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(56, 40), .y_offset = 16, }, + [SPECIES_BASCULIN_WHITE_STRIPED] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = { @@ -5414,6 +5545,11 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, + [SPECIES_ENAMORUS_THERIAN] = + { + .size = MON_COORDS_SIZE(64, 64), + .y_offset = 0, + }, // Kyurem [SPECIES_KYUREM_WHITE] = { diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 7640dc23e4..8669e45e96 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -899,6 +899,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(GLASTRIER, gMonFrontPic_Glastrier), SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex), + SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer), + SPECIES_SPRITE(KLEAVOR, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Kleavor), + SPECIES_SPRITE(URSALUNA, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Ursaluna), + SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion), + SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler), + SPECIES_SPRITE(OVERQWIL, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Overqwil), + SPECIES_SPRITE(ENAMORUS, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Enamorus), SPECIES_SPRITE(VENUSAUR_MEGA, gMonFrontPic_VenusaurMega), SPECIES_SPRITE(CHARIZARD_MEGA_X, gMonFrontPic_CharizardMegaX), @@ -991,6 +998,23 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(YAMASK_GALARIAN, gMonFrontPic_YamaskGalarian), SPECIES_SPRITE(STUNFISK_GALARIAN, gMonFrontPic_StunfiskGalarian), + SPECIES_SPRITE(GROWLITHE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_GrowlitheHisuian), + SPECIES_SPRITE(ARCANINE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ArcanineHisuian), + SPECIES_SPRITE(VOLTORB_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_VoltorbHisuian), + SPECIES_SPRITE(ELECTRODE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ElectrodeHisuian), + SPECIES_SPRITE(TYPHLOSION_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_TyphlosionHisuian), + SPECIES_SPRITE(QWILFISH_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_QwilfishHisuian), + SPECIES_SPRITE(SNEASEL_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SneaselHisuian), + SPECIES_SPRITE(SAMUROTT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SamurottHisuian), + SPECIES_SPRITE(LILLIGANT_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_LilligantHisuian), + SPECIES_SPRITE(ZORUA_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ZoruaHisuian), + SPECIES_SPRITE(ZOROARK_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_ZoroarkHisuian), + SPECIES_SPRITE(BRAVIARY_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BraviaryHisuian), + SPECIES_SPRITE(SLIGGOO_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_SliggooHisuian), + SPECIES_SPRITE(GOODRA_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_GoodraHisuian), + SPECIES_SPRITE(AVALUGG_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_AvaluggHisuian), + SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DecidueyeHisuian), + SPECIES_SPRITE(PIKACHU_COSPLAY, gMonFrontPic_PikachuCosplay), SPECIES_SPRITE(PIKACHU_ROCK_STAR, gMonFrontPic_PikachuRockStar), SPECIES_SPRITE(PIKACHU_BELLE, gMonFrontPic_PikachuBelle), @@ -1063,6 +1087,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ROTOM_FAN, gMonFrontPic_RotomFan), SPECIES_SPRITE(ROTOM_MOW, gMonFrontPic_RotomMow), + SPECIES_SPRITE(DIALGA_ORIGIN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_DialgaOrigin), + SPECIES_SPRITE(PALKIA_ORIGIN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_PalkiaOrigin), SPECIES_SPRITE(GIRATINA_ORIGIN, gMonFrontPic_GiratinaOrigin), SPECIES_SPRITE(SHAYMIN_SKY, gMonFrontPic_ShayminSky), @@ -1086,6 +1112,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(ARCEUS_FAIRY, gMonFrontPic_Arceus), SPECIES_SPRITE(BASCULIN_BLUE_STRIPED, gMonFrontPic_BasculinBlueStriped), + SPECIES_SPRITE(BASCULIN_WHITE_STRIPED, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculinWhiteStriped), SPECIES_SPRITE(DARMANITAN_ZEN_MODE, gMonFrontPic_DarmanitanZenMode), SPECIES_SPRITE(DARMANITAN_ZEN_MODE_GALARIAN, gMonFrontPic_DarmanitanZenModeGalarian), @@ -1101,6 +1128,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(TORNADUS_THERIAN, gMonFrontPic_TornadusTherian), SPECIES_SPRITE(THUNDURUS_THERIAN, gMonFrontPic_ThundurusTherian), SPECIES_SPRITE(LANDORUS_THERIAN, gMonFrontPic_LandorusTherian), + SPECIES_SPRITE(ENAMORUS_THERIAN, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_EnamorusTherian), SPECIES_SPRITE(KYUREM_WHITE, gMonFrontPic_KyuremWhite), SPECIES_SPRITE(KYUREM_BLACK, gMonFrontPic_KyuremBlack), @@ -1292,4 +1320,5 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), + SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_BasculegionF), }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 3de4107007..21af8045d2 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -899,6 +899,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(GLASTRIER, gMonPalette_Glastrier), SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier), SPECIES_PAL(CALYREX, gMonPalette_Calyrex), + SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer), + SPECIES_PAL(KLEAVOR, gMonPalette_CircledQuestionMark), // gMonPalette_Kleavor), + SPECIES_PAL(URSALUNA, gMonPalette_CircledQuestionMark), // gMonPalette_Ursaluna), + SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion), + SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler), + SPECIES_PAL(OVERQWIL, gMonPalette_CircledQuestionMark), // gMonPalette_Overqwil), + SPECIES_PAL(ENAMORUS, gMonPalette_CircledQuestionMark), // gMonPalette_Enamorus), SPECIES_PAL(VENUSAUR_MEGA, gMonPalette_VenusaurMega), SPECIES_PAL(CHARIZARD_MEGA_X, gMonPalette_CharizardMegaX), @@ -991,6 +998,23 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(YAMASK_GALARIAN, gMonPalette_YamaskGalarian), SPECIES_PAL(STUNFISK_GALARIAN, gMonPalette_StunfiskGalarian), + SPECIES_PAL(GROWLITHE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_GrowlitheHisuian), + SPECIES_PAL(ARCANINE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ArcanineHisuian), + SPECIES_PAL(VOLTORB_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_VoltorbHisuian), + SPECIES_PAL(ELECTRODE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ElectrodeHisuian), + SPECIES_PAL(TYPHLOSION_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_TyphlosionHisuian), + SPECIES_PAL(QWILFISH_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_QwilfishHisuian), + SPECIES_PAL(SNEASEL_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SneaselHisuian), + SPECIES_PAL(SAMUROTT_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SamurottHisuian), + SPECIES_PAL(LILLIGANT_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_LilligantHisuian), + SPECIES_PAL(ZORUA_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ZoruaHisuian), + SPECIES_PAL(ZOROARK_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_ZoroarkHisuian), + SPECIES_PAL(BRAVIARY_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_BraviaryHisuian), + SPECIES_PAL(SLIGGOO_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_SliggooHisuian), + SPECIES_PAL(GOODRA_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_GoodraHisuian), + SPECIES_PAL(AVALUGG_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_AvaluggHisuian), + SPECIES_PAL(DECIDUEYE_HISUIAN, gMonPalette_CircledQuestionMark), // gMonPalette_DecidueyeHisuian), + SPECIES_PAL(PIKACHU_COSPLAY, gMonPalette_PikachuCosplay), SPECIES_PAL(PIKACHU_ROCK_STAR, gMonPalette_PikachuRockStar), SPECIES_PAL(PIKACHU_BELLE, gMonPalette_PikachuBelle), @@ -1063,6 +1087,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ROTOM_FAN, gMonPalette_RotomFan), SPECIES_PAL(ROTOM_MOW, gMonPalette_RotomMow), + SPECIES_PAL(DIALGA_ORIGIN, gMonPalette_CircledQuestionMark), // gMonPalette_DialgaOrigin), + SPECIES_PAL(PALKIA_ORIGIN, gMonPalette_CircledQuestionMark), // gMonPalette_PalkiaOrigin), SPECIES_PAL(GIRATINA_ORIGIN, gMonPalette_GiratinaOrigin), SPECIES_PAL(SHAYMIN_SKY, gMonPalette_ShayminSky), @@ -1086,6 +1112,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(ARCEUS_FAIRY, gMonPalette_ArceusFairy), SPECIES_PAL(BASCULIN_BLUE_STRIPED, gMonPalette_BasculinBlueStriped), + SPECIES_PAL(BASCULIN_WHITE_STRIPED, gMonPalette_CircledQuestionMark), // gMonPalette_BasculinWhiteStriped), SPECIES_PAL(DARMANITAN_ZEN_MODE, gMonPalette_DarmanitanZenMode), SPECIES_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonPalette_DarmanitanZenModeGalarian), @@ -1101,6 +1128,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(TORNADUS_THERIAN, gMonPalette_TornadusTherian), SPECIES_PAL(THUNDURUS_THERIAN, gMonPalette_ThundurusTherian), SPECIES_PAL(LANDORUS_THERIAN, gMonPalette_LandorusTherian), + SPECIES_PAL(ENAMORUS_THERIAN, gMonPalette_CircledQuestionMark), // gMonPalette_EnamorusTherian), SPECIES_PAL(KYUREM_WHITE, gMonPalette_KyuremWhite), SPECIES_PAL(KYUREM_BLACK, gMonPalette_KyuremBlack), @@ -1292,4 +1320,5 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), SPECIES_PAL(PYROAR, gMonPalette_PyroarF), + SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_BasculegionF), }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index aa7c4153e7..0a7576dd8b 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -899,6 +899,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(GLASTRIER, gMonShinyPalette_Glastrier), SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier), SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex), + SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer), + SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Kleavor), + SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Ursaluna), + SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion), + SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler), + SPECIES_SHINY_PAL(OVERQWIL, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Overqwil), + SPECIES_SHINY_PAL(ENAMORUS, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Enamorus), SPECIES_SHINY_PAL(VENUSAUR_MEGA, gMonShinyPalette_VenusaurMega), SPECIES_SHINY_PAL(CHARIZARD_MEGA_X, gMonShinyPalette_CharizardMegaX), @@ -991,6 +998,23 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(YAMASK_GALARIAN, gMonShinyPalette_YamaskGalarian), SPECIES_SHINY_PAL(STUNFISK_GALARIAN, gMonShinyPalette_StunfiskGalarian), + SPECIES_SHINY_PAL(GROWLITHE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_GrowlitheHisuian), + SPECIES_SHINY_PAL(ARCANINE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ArcanineHisuian), + SPECIES_SHINY_PAL(VOLTORB_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_VoltorbHisuian), + SPECIES_SHINY_PAL(ELECTRODE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ElectrodeHisuian), + SPECIES_SHINY_PAL(TYPHLOSION_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_TyphlosionHisuian), + SPECIES_SHINY_PAL(QWILFISH_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_QwilfishHisuian), + SPECIES_SHINY_PAL(SNEASEL_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SneaselHisuian), + SPECIES_SHINY_PAL(SAMUROTT_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SamurottHisuian), + SPECIES_SHINY_PAL(LILLIGANT_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_LilligantHisuian), + SPECIES_SHINY_PAL(ZORUA_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ZoruaHisuian), + SPECIES_SHINY_PAL(ZOROARK_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_ZoroarkHisuian), + SPECIES_SHINY_PAL(BRAVIARY_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BraviaryHisuian), + SPECIES_SHINY_PAL(SLIGGOO_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_SliggooHisuian), + SPECIES_SHINY_PAL(GOODRA_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_GoodraHisuian), + SPECIES_SHINY_PAL(AVALUGG_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_AvaluggHisuian), + SPECIES_SHINY_PAL(DECIDUEYE_HISUIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_DecidueyeHisuian), + SPECIES_SHINY_PAL(PIKACHU_COSPLAY, gMonShinyPalette_PikachuCosplay), SPECIES_SHINY_PAL(PIKACHU_ROCK_STAR, gMonShinyPalette_PikachuRockStar), SPECIES_SHINY_PAL(PIKACHU_BELLE, gMonShinyPalette_PikachuBelle), @@ -1063,6 +1087,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ROTOM_FAN, gMonShinyPalette_RotomFan), SPECIES_SHINY_PAL(ROTOM_MOW, gMonShinyPalette_RotomMow), + SPECIES_SHINY_PAL(DIALGA_ORIGIN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_DialgaOrigin), + SPECIES_SHINY_PAL(PALKIA_ORIGIN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_PalkiaOrigin), SPECIES_SHINY_PAL(GIRATINA_ORIGIN, gMonShinyPalette_GiratinaOrigin), SPECIES_SHINY_PAL(SHAYMIN_SKY, gMonShinyPalette_ShayminSky), @@ -1086,6 +1112,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(ARCEUS_FAIRY, gMonShinyPalette_ArceusFairy), SPECIES_SHINY_PAL(BASCULIN_BLUE_STRIPED, gMonShinyPalette_BasculinBlueStriped), + SPECIES_SHINY_PAL(BASCULIN_WHITE_STRIPED, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculinWhiteStriped), SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE, gMonShinyPalette_DarmanitanZenMode), SPECIES_SHINY_PAL(DARMANITAN_ZEN_MODE_GALARIAN, gMonShinyPalette_DarmanitanZenModeGalarian), @@ -1101,6 +1128,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(TORNADUS_THERIAN, gMonShinyPalette_TornadusTherian), SPECIES_SHINY_PAL(THUNDURUS_THERIAN, gMonShinyPalette_ThundurusTherian), SPECIES_SHINY_PAL(LANDORUS_THERIAN, gMonShinyPalette_LandorusTherian), + SPECIES_SHINY_PAL(ENAMORUS_THERIAN, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_EnamorusTherian), SPECIES_SHINY_PAL(KYUREM_WHITE, gMonShinyPalette_KyuremWhite), SPECIES_SHINY_PAL(KYUREM_BLACK, gMonShinyPalette_KyuremBlack), @@ -1292,4 +1320,5 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF), SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), + SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_BasculegionF), }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 8129e2a602..aa8b4261ea 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -898,6 +898,13 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GLASTRIER] = _("Glastrier"), [SPECIES_SPECTRIER] = _("Spectrier"), [SPECIES_CALYREX] = _("Calyrex"), + [SPECIES_WYRDEER] = _("Wyrdeer"), + [SPECIES_KLEAVOR] = _("Kleavor"), + [SPECIES_URSALUNA] = _("Ursaluna"), + [SPECIES_BASCULEGION] = _("Bsculegion"), + [SPECIES_SNEASLER] = _("Sneasler"), + [SPECIES_OVERQWIL] = _("Overqwil"), + [SPECIES_ENAMORUS] = _("Enamorus"), // Megas [SPECIES_VENUSAUR_MEGA] = _("Venusaur"), @@ -993,6 +1000,24 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_YAMASK_GALARIAN] = _("Yamask"), [SPECIES_STUNFISK_GALARIAN] = _("Stunfisk"), +//Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN] = _("Growlithe"), + [SPECIES_ARCANINE_HISUIAN] = _("Arcanine"), + [SPECIES_VOLTORB_HISUIAN] = _("Voltorb"), + [SPECIES_ELECTRODE_HISUIAN] = _("Electrode"), + [SPECIES_TYPHLOSION_HISUIAN] = _("Typhlosion"), + [SPECIES_QWILFISH_HISUIAN] = _("Qwilfish"), + [SPECIES_SNEASEL_HISUIAN] = _("Sneasel"), + [SPECIES_SAMUROTT_HISUIAN] = _("Samurott"), + [SPECIES_LILLIGANT_HISUIAN] = _("Lilligant"), + [SPECIES_ZORUA_HISUIAN] = _("Zorua"), + [SPECIES_ZOROARK_HISUIAN] = _("Zoroark"), + [SPECIES_BRAVIARY_HISUIAN] = _("Braviary"), + [SPECIES_SLIGGOO_HISUIAN] = _("Sliggoo"), + [SPECIES_GOODRA_HISUIAN] = _("Goodra"), + [SPECIES_AVALUGG_HISUIAN] = _("Avalugg"), + [SPECIES_DECIDUEYE_HISUIAN] = _("Decidueye"), + // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), [SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"), @@ -1065,7 +1090,9 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ROTOM_FROST] = _("Rotom"), [SPECIES_ROTOM_MOW] = _("Rotom"), [SPECIES_ROTOM_WASH] = _("Rotom"), - // Giratina + // Origin + [SPECIES_DIALGA_ORIGIN] = _("Dialga"), + [SPECIES_PALKIA_ORIGIN] = _("Palkia"), [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), // Shaymin [SPECIES_SHAYMIN_SKY] = _("Shaymin"), @@ -1089,6 +1116,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ARCEUS_FAIRY] = _("Arceus"), // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), + [SPECIES_BASCULIN_WHITE_STRIPED] = _("Basculin"), // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = _("Darmanitan"), [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = _("Darmanitan"), @@ -1104,6 +1132,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_TORNADUS_THERIAN] = _("Tornadus"), [SPECIES_THUNDURUS_THERIAN] = _("Thundurus"), [SPECIES_LANDORUS_THERIAN] = _("Landorus"), + [SPECIES_ENAMORUS_THERIAN] = _("Enamorus"), // Kyurem [SPECIES_KYUREM_BLACK] = _("Kyurem"), [SPECIES_KYUREM_WHITE] = _("Kyurem"), diff --git a/src/pokemon.c b/src/pokemon.c index 215dc00626..0e8bbfa6cb 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1218,6 +1218,13 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(GLASTRIER), SPECIES_TO_NATIONAL(SPECTRIER), SPECIES_TO_NATIONAL(CALYREX), + SPECIES_TO_NATIONAL(WYRDEER), + SPECIES_TO_NATIONAL(KLEAVOR), + SPECIES_TO_NATIONAL(URSALUNA), + SPECIES_TO_NATIONAL(BASCULEGION), + SPECIES_TO_NATIONAL(SNEASLER), + SPECIES_TO_NATIONAL(OVERQWIL), + SPECIES_TO_NATIONAL(ENAMORUS), // Megas [SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR, @@ -1310,6 +1317,23 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_DARMANITAN_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_YAMASK_GALARIAN - 1] = NATIONAL_DEX_YAMASK, [SPECIES_STUNFISK_GALARIAN - 1] = NATIONAL_DEX_STUNFISK, +//Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN - 1] = NATIONAL_DEX_GROWLITHE, + [SPECIES_ARCANINE_HISUIAN - 1] = NATIONAL_DEX_ARCANINE, + [SPECIES_VOLTORB_HISUIAN - 1] = NATIONAL_DEX_VOLTORB, + [SPECIES_ELECTRODE_HISUIAN - 1] = NATIONAL_DEX_ELECTRODE, + [SPECIES_TYPHLOSION_HISUIAN - 1] = NATIONAL_DEX_TYPHLOSION, + [SPECIES_QWILFISH_HISUIAN - 1] = NATIONAL_DEX_QWILFISH, + [SPECIES_SNEASEL_HISUIAN - 1] = NATIONAL_DEX_SNEASEL, + [SPECIES_SAMUROTT_HISUIAN - 1] = NATIONAL_DEX_SAMUROTT, + [SPECIES_LILLIGANT_HISUIAN - 1] = NATIONAL_DEX_LILLIGANT, + [SPECIES_ZORUA_HISUIAN - 1] = NATIONAL_DEX_ZORUA, + [SPECIES_ZOROARK_HISUIAN - 1] = NATIONAL_DEX_ZOROARK, + [SPECIES_BRAVIARY_HISUIAN - 1] = NATIONAL_DEX_BRAVIARY, + [SPECIES_SLIGGOO_HISUIAN - 1] = NATIONAL_DEX_SLIGGOO, + [SPECIES_GOODRA_HISUIAN - 1] = NATIONAL_DEX_GOODRA, + [SPECIES_AVALUGG_HISUIAN - 1] = NATIONAL_DEX_AVALUGG, + [SPECIES_DECIDUEYE_HISUIAN - 1] = NATIONAL_DEX_DECIDUEYE, // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU, [SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU, @@ -1382,7 +1406,9 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM, [SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM, [SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM, - // Giratina + // Origin + [SPECIES_DIALGA_ORIGIN - 1] = NATIONAL_DEX_DIALGA, + [SPECIES_PALKIA_ORIGIN - 1] = NATIONAL_DEX_PALKIA, [SPECIES_GIRATINA_ORIGIN - 1] = NATIONAL_DEX_GIRATINA, // Shaymin [SPECIES_SHAYMIN_SKY - 1] = NATIONAL_DEX_SHAYMIN, @@ -1406,6 +1432,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS, // Basculin [SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, + [SPECIES_BASCULIN_WHITE_STRIPED - 1] = NATIONAL_DEX_BASCULIN, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN - 1] = NATIONAL_DEX_DARMANITAN, @@ -1421,6 +1448,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS, [SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS, [SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS, + [SPECIES_ENAMORUS_THERIAN - 1] = NATIONAL_DEX_ENAMORUS, // Kyurem [SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM, [SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM, @@ -2776,6 +2804,13 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_GLASTRIER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_SPECTRIER - 1] = ANIM_V_SQUISH_AND_BOUNCE, [SPECIES_CALYREX - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_WYRDEER - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_KLEAVOR - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_URSALUNA - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_BASCULEGION - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_SNEASLER - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_OVERQWIL - 1] = ANIM_V_SQUISH_AND_BOUNCE, + [SPECIES_ENAMORUS - 1] = ANIM_V_SQUISH_AND_BOUNCE, // Forms [SPECIES_ROTOM_HEAT - 1] = ANIM_V_SQUISH_AND_BOUNCE, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 0faebfe74b..5420c1ede6 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -928,7 +928,14 @@ const u8 *const gMonIconTable[] = [SPECIES_REGIDRAGO] = gMonIcon_Regidrago, [SPECIES_GLASTRIER] = gMonIcon_Glastrier, [SPECIES_SPECTRIER] = gMonIcon_Spectrier, - [SPECIES_CALYREX] = gMonIcon_QuestionMark,//gMonIcon_Calyrex, + [SPECIES_CALYREX] = gMonIcon_Calyrex, + [SPECIES_WYRDEER] = gMonIcon_Wyrdeer, + [SPECIES_KLEAVOR] = gMonIcon_Kleavor, + [SPECIES_URSALUNA] = gMonIcon_Ursaluna, + [SPECIES_BASCULEGION] = gMonIcon_Basculegion, + [SPECIES_SNEASLER] = gMonIcon_Sneasler, + [SPECIES_OVERQWIL] = gMonIcon_Overqwil, + [SPECIES_ENAMORUS] = gMonIcon_Enamorus, [SPECIES_VENUSAUR_MEGA] = gMonIcon_VenusaurMega, [SPECIES_CHARIZARD_MEGA_X] = gMonIcon_CharizardMegaX, [SPECIES_CHARIZARD_MEGA_Y] = gMonIcon_CharizardMegaY, @@ -1016,6 +1023,22 @@ const u8 *const gMonIconTable[] = [SPECIES_DARMANITAN_GALARIAN] = gMonIcon_DarmanitanGalarian, [SPECIES_YAMASK_GALARIAN] = gMonIcon_YamaskGalarian, [SPECIES_STUNFISK_GALARIAN] = gMonIcon_StunfiskGalarian, + [SPECIES_GROWLITHE_HISUIAN] = gMonIcon_GrowlitheHisuian, + [SPECIES_ARCANINE_HISUIAN] = gMonIcon_ArcanineHisuian, + [SPECIES_VOLTORB_HISUIAN] = gMonIcon_VoltorbHisuian, + [SPECIES_ELECTRODE_HISUIAN] = gMonIcon_ElectrodeHisuian, + [SPECIES_TYPHLOSION_HISUIAN] = gMonIcon_TyphlosionHisuian, + [SPECIES_QWILFISH_HISUIAN] = gMonIcon_QwilfishHisuian, + [SPECIES_SNEASEL_HISUIAN] = gMonIcon_SneaselHisuian, + [SPECIES_SAMUROTT_HISUIAN] = gMonIcon_SamurottHisuian, + [SPECIES_LILLIGANT_HISUIAN] = gMonIcon_LilligantHisuian, + [SPECIES_ZORUA_HISUIAN] = gMonIcon_ZoruaHisuian, + [SPECIES_ZOROARK_HISUIAN] = gMonIcon_ZoroarkHisuian, + [SPECIES_BRAVIARY_HISUIAN] = gMonIcon_BraviaryHisuian, + [SPECIES_SLIGGOO_HISUIAN] = gMonIcon_SliggooHisuian, + [SPECIES_GOODRA_HISUIAN] = gMonIcon_GoodraHisuian, + [SPECIES_AVALUGG_HISUIAN] = gMonIcon_AvaluggHisuian, + [SPECIES_DECIDUEYE_HISUIAN] = gMonIcon_DecidueyeHisuian, [SPECIES_PIKACHU_COSPLAY] = gMonIcon_PikachuCosplay, [SPECIES_PIKACHU_ROCK_STAR] = gMonIcon_PikachuRockStar, [SPECIES_PIKACHU_BELLE] = gMonIcon_PikachuBelle, @@ -1076,6 +1099,8 @@ const u8 *const gMonIconTable[] = [SPECIES_ROTOM_FROST] = gMonIcon_RotomFrost, [SPECIES_ROTOM_FAN] = gMonIcon_RotomFan, [SPECIES_ROTOM_MOW] = gMonIcon_RotomMow, + [SPECIES_DIALGA_ORIGIN] = gMonIcon_DialgaOrigin, + [SPECIES_PALKIA_ORIGIN] = gMonIcon_PalkiaOrigin, [SPECIES_GIRATINA_ORIGIN] = gMonIcon_GiratinaOrigin, [SPECIES_SHAYMIN_SKY] = gMonIcon_ShayminSky, [SPECIES_ARCEUS_FIGHTING] = gMonIcon_Arceus, @@ -1096,6 +1121,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ARCEUS_DARK] = gMonIcon_Arceus, [SPECIES_ARCEUS_FAIRY] = gMonIcon_Arceus, [SPECIES_BASCULIN_BLUE_STRIPED] = gMonIcon_BasculinBlueStriped, + [SPECIES_BASCULIN_WHITE_STRIPED] = gMonIcon_BasculinWhiteStriped, [SPECIES_DARMANITAN_ZEN_MODE] = gMonIcon_DarmanitanZenMode, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = gMonIcon_DarmanitanZenModeGalarian, [SPECIES_DEERLING_SUMMER] = gMonIcon_DeerlingSummer, @@ -1107,6 +1133,7 @@ const u8 *const gMonIconTable[] = [SPECIES_TORNADUS_THERIAN] = gMonIcon_TornadusTherian, [SPECIES_THUNDURUS_THERIAN] = gMonIcon_ThundurusTherian, [SPECIES_LANDORUS_THERIAN] = gMonIcon_LandorusTherian, + [SPECIES_ENAMORUS_THERIAN] = gMonIcon_EnamorusTherian, [SPECIES_KYUREM_WHITE] = gMonIcon_KyuremWhite, [SPECIES_KYUREM_BLACK] = gMonIcon_KyuremBlack, [SPECIES_KELDEO_RESOLUTE] = gMonIcon_KeldeoResolute, @@ -1257,6 +1284,7 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_JELLICENT] = gMonIcon_JellicentF, [SPECIES_PYROAR] = gMonIcon_PyroarF, + [SPECIES_BASCULEGION] = gMonIcon_BasculegionF, }; const u8 gMonIconPaletteIndices[] = @@ -2159,6 +2187,13 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_GLASTRIER] = 0, [SPECIES_SPECTRIER] = 0, [SPECIES_CALYREX] = 0, + [SPECIES_WYRDEER] = 2, + [SPECIES_KLEAVOR] = 2, + [SPECIES_URSALUNA] = 2, + [SPECIES_BASCULEGION] = 1, + [SPECIES_SNEASLER] = 2, + [SPECIES_OVERQWIL] = 2, + [SPECIES_ENAMORUS] = 1, [SPECIES_VENUSAUR_MEGA] = 1, [SPECIES_CHARIZARD_MEGA_X] = 0, [SPECIES_CHARIZARD_MEGA_Y] = 0, @@ -2246,6 +2281,22 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_DARMANITAN_GALARIAN] = 0, [SPECIES_YAMASK_GALARIAN] = 2, [SPECIES_STUNFISK_GALARIAN] = 1, + [SPECIES_GROWLITHE_HISUIAN] = 0, + [SPECIES_ARCANINE_HISUIAN] = 0, + [SPECIES_VOLTORB_HISUIAN] = 0, + [SPECIES_ELECTRODE_HISUIAN] = 1, + [SPECIES_TYPHLOSION_HISUIAN] = 1, + [SPECIES_QWILFISH_HISUIAN] = 0, + [SPECIES_SNEASEL_HISUIAN] = 2, + [SPECIES_SAMUROTT_HISUIAN] = 0, + [SPECIES_LILLIGANT_HISUIAN] = 1, + [SPECIES_ZORUA_HISUIAN] = 0, + [SPECIES_ZOROARK_HISUIAN] = 0, + [SPECIES_BRAVIARY_HISUIAN] = 2, + [SPECIES_SLIGGOO_HISUIAN] = 2, + [SPECIES_GOODRA_HISUIAN] = 2, + [SPECIES_AVALUGG_HISUIAN] = 5, + [SPECIES_DECIDUEYE_HISUIAN] = 0, [SPECIES_PIKACHU_COSPLAY] = 2, [SPECIES_PIKACHU_ROCK_STAR] = 1, [SPECIES_PIKACHU_BELLE] = 0, @@ -2277,6 +2328,8 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ROTOM_FROST] = 5, [SPECIES_ROTOM_FAN] = 0, [SPECIES_ROTOM_MOW] = 0, + [SPECIES_DIALGA_ORIGIN] = 0, + [SPECIES_PALKIA_ORIGIN] = 2, [SPECIES_GIRATINA_ORIGIN] = 0, [SPECIES_SHAYMIN_SKY] = 1, [SPECIES_ARCEUS_FIGHTING] = 1, @@ -2297,6 +2350,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ARCEUS_DARK] = 1, [SPECIES_ARCEUS_FAIRY] = 1, [SPECIES_BASCULIN_BLUE_STRIPED] = 0, + [SPECIES_BASCULIN_WHITE_STRIPED] = 0, [SPECIES_DARMANITAN_ZEN_MODE] = 0, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = 0, [SPECIES_DEERLING_SUMMER] = 1, @@ -2308,6 +2362,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_TORNADUS_THERIAN] = 1, [SPECIES_THUNDURUS_THERIAN] = 0, [SPECIES_LANDORUS_THERIAN] = 0, + [SPECIES_ENAMORUS_THERIAN] = 1, [SPECIES_KYUREM_WHITE] = 0, [SPECIES_KYUREM_BLACK] = 0, [SPECIES_KELDEO_RESOLUTE] = 0, @@ -2451,6 +2506,7 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_FRILLISH] = 1, [SPECIES_JELLICENT] = 1, [SPECIES_PYROAR] = 2, + [SPECIES_BASCULEGION] = 0, }; const struct SpritePalette gMonIconPaletteTable[] = From ff861ff963d0ca1a4eb01927b08fed2509727a7e Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Mon, 4 Jul 2022 12:28:40 +0700 Subject: [PATCH 2/9] Add some of Legends Arceus battle sprites --- graphics/pokemon/arcanine/hisuian/back.png | Bin 0 -> 902 bytes graphics/pokemon/arcanine/hisuian/front.png | Bin 0 -> 1137 bytes graphics/pokemon/arcanine/hisuian/normal.pal | 19 ++ graphics/pokemon/arcanine/hisuian/shiny.pal | 19 ++ graphics/pokemon/avalugg/hisuian/back.png | Bin 0 -> 528 bytes graphics/pokemon/avalugg/hisuian/front.png | Bin 0 -> 809 bytes graphics/pokemon/avalugg/hisuian/normal.pal | 19 ++ graphics/pokemon/avalugg/hisuian/shiny.pal | 19 ++ .../pokemon/basculin/white_striped/back.png | Bin 0 -> 645 bytes .../pokemon/basculin/white_striped/front.png | Bin 0 -> 546 bytes .../pokemon/basculin/white_striped/normal.pal | 19 ++ .../pokemon/basculin/white_striped/shiny.pal | 19 ++ graphics/pokemon/braviary/hisuian/back.png | Bin 0 -> 786 bytes graphics/pokemon/braviary/hisuian/front.png | Bin 0 -> 978 bytes graphics/pokemon/braviary/hisuian/normal.pal | 19 ++ graphics/pokemon/braviary/hisuian/shiny.pal | 19 ++ graphics/pokemon/dialga/origin/back.png | Bin 0 -> 623 bytes graphics/pokemon/dialga/origin/front.png | Bin 0 -> 1072 bytes graphics/pokemon/dialga/origin/normal.pal | 19 ++ graphics/pokemon/dialga/origin/shiny.pal | 19 ++ graphics/pokemon/electrode/hisuian/back.png | Bin 0 -> 516 bytes graphics/pokemon/electrode/hisuian/front.png | Bin 0 -> 653 bytes graphics/pokemon/electrode/hisuian/normal.pal | 19 ++ graphics/pokemon/electrode/hisuian/shiny.pal | 19 ++ graphics/pokemon/goodra/hisuian/back.png | Bin 0 -> 882 bytes graphics/pokemon/goodra/hisuian/front.png | Bin 0 -> 924 bytes graphics/pokemon/goodra/hisuian/normal.pal | 19 ++ graphics/pokemon/goodra/hisuian/shiny.pal | 19 ++ graphics/pokemon/growlithe/hisuian/back.png | Bin 0 -> 678 bytes graphics/pokemon/growlithe/hisuian/front.png | Bin 0 -> 701 bytes graphics/pokemon/growlithe/hisuian/normal.pal | 19 ++ graphics/pokemon/growlithe/hisuian/shiny.pal | 19 ++ graphics/pokemon/lilligant/hisuian/back.png | Bin 0 -> 814 bytes graphics/pokemon/lilligant/hisuian/front.png | Bin 0 -> 705 bytes graphics/pokemon/lilligant/hisuian/normal.pal | 19 ++ graphics/pokemon/lilligant/hisuian/shiny.pal | 19 ++ graphics/pokemon/overqwil/back.png | Bin 0 -> 605 bytes graphics/pokemon/overqwil/front.png | Bin 0 -> 742 bytes graphics/pokemon/overqwil/normal.pal | 19 ++ graphics/pokemon/overqwil/shiny.pal | 19 ++ graphics/pokemon/palkia/origin/back.png | Bin 0 -> 739 bytes graphics/pokemon/palkia/origin/front.png | Bin 0 -> 1162 bytes graphics/pokemon/palkia/origin/normal.pal | 19 ++ graphics/pokemon/palkia/origin/shiny.pal | 19 ++ graphics/pokemon/qwilfish/hisuian/back.png | Bin 0 -> 606 bytes graphics/pokemon/qwilfish/hisuian/front.png | Bin 0 -> 571 bytes graphics/pokemon/qwilfish/hisuian/normal.pal | 19 ++ graphics/pokemon/qwilfish/hisuian/shiny.pal | 19 ++ graphics/pokemon/sliggoo/hisuian/back.png | Bin 0 -> 606 bytes graphics/pokemon/sliggoo/hisuian/front.png | Bin 0 -> 659 bytes graphics/pokemon/sliggoo/hisuian/normal.pal | 19 ++ graphics/pokemon/sliggoo/hisuian/shiny.pal | 19 ++ graphics/pokemon/sneasel/hisuian/back.png | Bin 0 -> 591 bytes graphics/pokemon/sneasel/hisuian/front.png | Bin 0 -> 682 bytes graphics/pokemon/sneasel/hisuian/normal.pal | 19 ++ graphics/pokemon/sneasel/hisuian/shiny.pal | 19 ++ graphics/pokemon/typhlosion/hisuian/back.png | Bin 0 -> 767 bytes graphics/pokemon/typhlosion/hisuian/front.png | Bin 0 -> 872 bytes .../pokemon/typhlosion/hisuian/normal.pal | 19 ++ graphics/pokemon/typhlosion/hisuian/shiny.pal | 19 ++ graphics/pokemon/ursaluna/back.png | Bin 0 -> 564 bytes graphics/pokemon/ursaluna/front.png | Bin 0 -> 996 bytes graphics/pokemon/ursaluna/normal.pal | 19 ++ graphics/pokemon/ursaluna/shiny.pal | 19 ++ graphics/pokemon/voltorb/hisuian/back.png | Bin 0 -> 443 bytes graphics/pokemon/voltorb/hisuian/front.png | Bin 0 -> 436 bytes graphics/pokemon/voltorb/hisuian/normal.pal | 19 ++ graphics/pokemon/voltorb/hisuian/shiny.pal | 19 ++ graphics/pokemon/zoroark/hisuian/back.png | Bin 0 -> 1185 bytes graphics/pokemon/zoroark/hisuian/front.png | Bin 0 -> 1099 bytes graphics/pokemon/zoroark/hisuian/normal.pal | 19 ++ graphics/pokemon/zoroark/hisuian/shiny.pal | 19 ++ graphics/pokemon/zorua/hisuian/back.png | Bin 0 -> 772 bytes graphics/pokemon/zorua/hisuian/front.png | Bin 0 -> 750 bytes graphics/pokemon/zorua/hisuian/normal.pal | 19 ++ graphics/pokemon/zorua/hisuian/shiny.pal | 19 ++ include/graphics.h | 152 ++++++++-------- src/data/graphics/pokemon.h | 168 +++++++++--------- .../pokemon_graphics/back_pic_coordinates.h | 54 +++--- src/data/pokemon_graphics/back_pic_table.h | 38 ++-- .../pokemon_graphics/enemy_mon_elevation.h | 4 + .../pokemon_graphics/front_pic_coordinates.h | 48 ++--- src/data/pokemon_graphics/front_pic_table.h | 38 ++-- src/data/pokemon_graphics/palette_table.h | 42 ++--- .../pokemon_graphics/shiny_palette_table.h | 44 ++--- 85 files changed, 1018 insertions(+), 292 deletions(-) create mode 100644 graphics/pokemon/arcanine/hisuian/back.png create mode 100644 graphics/pokemon/arcanine/hisuian/front.png create mode 100644 graphics/pokemon/arcanine/hisuian/normal.pal create mode 100644 graphics/pokemon/arcanine/hisuian/shiny.pal create mode 100644 graphics/pokemon/avalugg/hisuian/back.png create mode 100644 graphics/pokemon/avalugg/hisuian/front.png create mode 100644 graphics/pokemon/avalugg/hisuian/normal.pal create mode 100644 graphics/pokemon/avalugg/hisuian/shiny.pal create mode 100644 graphics/pokemon/basculin/white_striped/back.png create mode 100644 graphics/pokemon/basculin/white_striped/front.png create mode 100644 graphics/pokemon/basculin/white_striped/normal.pal create mode 100644 graphics/pokemon/basculin/white_striped/shiny.pal create mode 100644 graphics/pokemon/braviary/hisuian/back.png create mode 100644 graphics/pokemon/braviary/hisuian/front.png create mode 100644 graphics/pokemon/braviary/hisuian/normal.pal create mode 100644 graphics/pokemon/braviary/hisuian/shiny.pal create mode 100644 graphics/pokemon/dialga/origin/back.png create mode 100644 graphics/pokemon/dialga/origin/front.png create mode 100644 graphics/pokemon/dialga/origin/normal.pal create mode 100644 graphics/pokemon/dialga/origin/shiny.pal create mode 100644 graphics/pokemon/electrode/hisuian/back.png create mode 100644 graphics/pokemon/electrode/hisuian/front.png create mode 100644 graphics/pokemon/electrode/hisuian/normal.pal create mode 100644 graphics/pokemon/electrode/hisuian/shiny.pal create mode 100644 graphics/pokemon/goodra/hisuian/back.png create mode 100644 graphics/pokemon/goodra/hisuian/front.png create mode 100644 graphics/pokemon/goodra/hisuian/normal.pal create mode 100644 graphics/pokemon/goodra/hisuian/shiny.pal create mode 100644 graphics/pokemon/growlithe/hisuian/back.png create mode 100644 graphics/pokemon/growlithe/hisuian/front.png create mode 100644 graphics/pokemon/growlithe/hisuian/normal.pal create mode 100644 graphics/pokemon/growlithe/hisuian/shiny.pal create mode 100644 graphics/pokemon/lilligant/hisuian/back.png create mode 100644 graphics/pokemon/lilligant/hisuian/front.png create mode 100644 graphics/pokemon/lilligant/hisuian/normal.pal create mode 100644 graphics/pokemon/lilligant/hisuian/shiny.pal create mode 100644 graphics/pokemon/overqwil/back.png create mode 100644 graphics/pokemon/overqwil/front.png create mode 100644 graphics/pokemon/overqwil/normal.pal create mode 100644 graphics/pokemon/overqwil/shiny.pal create mode 100644 graphics/pokemon/palkia/origin/back.png create mode 100644 graphics/pokemon/palkia/origin/front.png create mode 100644 graphics/pokemon/palkia/origin/normal.pal create mode 100644 graphics/pokemon/palkia/origin/shiny.pal create mode 100644 graphics/pokemon/qwilfish/hisuian/back.png create mode 100644 graphics/pokemon/qwilfish/hisuian/front.png create mode 100644 graphics/pokemon/qwilfish/hisuian/normal.pal create mode 100644 graphics/pokemon/qwilfish/hisuian/shiny.pal create mode 100644 graphics/pokemon/sliggoo/hisuian/back.png create mode 100644 graphics/pokemon/sliggoo/hisuian/front.png create mode 100644 graphics/pokemon/sliggoo/hisuian/normal.pal create mode 100644 graphics/pokemon/sliggoo/hisuian/shiny.pal create mode 100644 graphics/pokemon/sneasel/hisuian/back.png create mode 100644 graphics/pokemon/sneasel/hisuian/front.png create mode 100644 graphics/pokemon/sneasel/hisuian/normal.pal create mode 100644 graphics/pokemon/sneasel/hisuian/shiny.pal create mode 100644 graphics/pokemon/typhlosion/hisuian/back.png create mode 100644 graphics/pokemon/typhlosion/hisuian/front.png create mode 100644 graphics/pokemon/typhlosion/hisuian/normal.pal create mode 100644 graphics/pokemon/typhlosion/hisuian/shiny.pal create mode 100644 graphics/pokemon/ursaluna/back.png create mode 100644 graphics/pokemon/ursaluna/front.png create mode 100644 graphics/pokemon/ursaluna/normal.pal create mode 100644 graphics/pokemon/ursaluna/shiny.pal create mode 100644 graphics/pokemon/voltorb/hisuian/back.png create mode 100644 graphics/pokemon/voltorb/hisuian/front.png create mode 100644 graphics/pokemon/voltorb/hisuian/normal.pal create mode 100644 graphics/pokemon/voltorb/hisuian/shiny.pal create mode 100644 graphics/pokemon/zoroark/hisuian/back.png create mode 100644 graphics/pokemon/zoroark/hisuian/front.png create mode 100644 graphics/pokemon/zoroark/hisuian/normal.pal create mode 100644 graphics/pokemon/zoroark/hisuian/shiny.pal create mode 100644 graphics/pokemon/zorua/hisuian/back.png create mode 100644 graphics/pokemon/zorua/hisuian/front.png create mode 100644 graphics/pokemon/zorua/hisuian/normal.pal create mode 100644 graphics/pokemon/zorua/hisuian/shiny.pal diff --git a/graphics/pokemon/arcanine/hisuian/back.png b/graphics/pokemon/arcanine/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..a6fdca501ad80a47b717c7e55e47b0349eae3292 GIT binary patch literal 902 zcmV;119|+3P)+-&?vB&0NB{j`1tThKsYEUDB#d2000000000000000GKn000009K zNkltn!se*}E*``*{> z5wP)om~00YVF!biM;7GZ~V=o zSmmbHPHXK*YX;!p=6+GCvgX_5$XXq){Q7oKU#}O0z-O;c>1popc3fn=D zQcDL#MKOjMz(1?*mq4uo1}1r-z+z;U4u~H3j{!rGD305AfN%~WPJqCNQnNNh889O? z!Gsur36916x?YuB*DPT;OT#luDI?RtMW^yp6S$A?0@>hF8o>~N(yDpFiz=8n1`r7_ zti(ZxH<7ZVk(_`Z2JHM8nm9s)^C!hFbP63eGaxY!=D?LED*>>J5}ss!PDulbg8lQv=n2rU znTp@t`YyiOF%1<1nl(CNKns5H>hcFtO--ePgkksi2H3PSF8g*P+?s(M0JVFWG;Cff zvTZkG^~!zPaqKW)CxZQ2aQzzihx@}_YGVtvom(ptDAf@*+K);oc z>a*q`ah->Nb@Z*@HzPNVzA0&x$N*YdsR{5i;2>OMcVm`GzilSk0szsWR(NE!oB-Y! z^ZMKRA+_NI0-CAlTT@`1tThKsYEUD9~6y000000000000000F9>6h000C0 zNkl)~f5QQn8!2Hu%Y(kv!?8t@>0HBk-qJULi3LasR-5epanEkjai#fpD za~?p+iXA7g%OQb}58V&lNKs%^#ZN{}>%Yz2`|G8fFTn17pykV#%>=a{*Eg&$Up7!0 ze%z*ZF94*5H``Q113Qx+0qjb)uhfaf%?;0Mh)UNzo2q^h*$gbqtXba`eKC+@EmP?_saS-Pd_`j_z8B>~s!spx&5Ud&RtPF*r7vw(J55T)vdC%l-0@K%`> zP#M5?BDPSLKQn*qPHqZv0S3+yA~FD_mCsUr=vuc8ay=Vfha{k=Kl&4Q=c$_PF(-#4m?`-~P##SO%g}48v-YZH;0mw)fA;($-?qraU*< z1+7JigAK)|Rw7j;$jZX0(625yOvq|nX{zcgo(=Vw(y?zr2t-Xji4+tzkVI?)RGDj{ z{BGBzA(6E5r~>soc^_y6t`%0&ia`6}Sl51`F%kCGOD)u}t3h=>90>yZMTs`IE*P-x z5V!490^LaG&^x(xQaK=In1Sji0J9%Gk?5CREcZIKiM0H%Fr|Sg$l2REOrF;B_eWMF zb|0Xyd(lVDbJw6zA@6bIAc(?E0Gl^_e&XZo&-(JzSACV?@e z3+ig5{jl}^@Nl&0pe;PQe~!DN!t)wOSszF5hlk@F2F|A1Z*jLtmRtf+M}0oPLmmSm zK@fY|t=+Xs49AqkgJTG#b0E5>-`Bb_*Iw=N2ctg(8gY|66Rj7_y2qe-pFYr|-v)}~ z`EjI>TC=@WgklH4ApyT705OK~1bNi$rCHf+0qK#(n#Nd1Fik3PF*hJ+HX%?=u@Xo` z$5SqM$B-&O zKGwKMZgowOcICf>D-{W)R*Laf)M<<%>`EG+cp3o|$%!`rCQ8Um%{Bqu@&-Vm1Avpv z+kh*=cZcPBpj`Za0B}e=5f(Nl-@OLDEFPgPaa`-P3^=Y=K=^{4_i3MNQmL%Jk0B*- z?z$^b61`5Mz literal 0 HcmV?d00001 diff --git a/graphics/pokemon/arcanine/hisuian/normal.pal b/graphics/pokemon/arcanine/hisuian/normal.pal new file mode 100644 index 0000000000..7502c6a4cc --- /dev/null +++ b/graphics/pokemon/arcanine/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 40 32 +0 0 0 +136 136 128 +96 96 80 +232 72 56 +176 48 32 +216 216 208 +248 248 240 +72 64 56 +40 40 40 +208 88 64 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/arcanine/hisuian/shiny.pal b/graphics/pokemon/arcanine/hisuian/shiny.pal new file mode 100644 index 0000000000..c786e1990f --- /dev/null +++ b/graphics/pokemon/arcanine/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 40 32 +0 0 0 +136 136 128 +96 96 80 +224 208 40 +176 152 0 +216 216 208 +248 248 240 +72 64 56 +40 40 40 +224 208 40 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/avalugg/hisuian/back.png b/graphics/pokemon/avalugg/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..885fd4c13a1c37339cae81e998477b422bc1620b GIT binary patch literal 528 zcmV+r0`L8aP)YU7{yC4h?7LnB}ygbI>bPsA+9a~$I`T)>qQIS+9i+&5eFwh=+Z^% zdJCef7sLk;UqNFpqEYI-w<`S;@&fj(=XcLJUr4F6&_e%2Mq2Efggh7f9Vh}!a!jHE zz#u3<1FN}|>Gm!G^oBGKFbQ_tt_BRA2M}xvdO_95RenG3M~GDbheoO)2Z#=_LjXPm zRRNrD&mM4y@&bT}P!%u-7(0mj&{!iBB;eifnUzKbu_mDWB@|$Ady_j;2g>)yZnv>D zS|2IkhHdiO$$bQ|?e<9H@o8O1z*E4)8IIhCwX_G;<3k_;W5BJ+m4+{UOyL8*o-7LR zyvw-K-^#bj9=7EtiW=pYR|zQ8w$NJ?>ByOG&epNQH6YXRP|E(tm+l1;nSmR8SA=^=8Jd zIa9K1-BDHfP38O08ft)fcdTz~i0Ov-MEe2M<8YX&=N{WQ8WV$@A7-J23iS;Qbl)lh Sc$MP-0000KAKFSk z>MF`k=@C=eDZ*>|>_Hn%66qDx9t<;52RO_kL1DARmQsf(ypIe3rAM0pIcQ;8w5Wr! z4{zRY02#vKbi@#vF}myHsp|8n0R=GyrC>N~4HzRO72d^X$h@sQ%Ft&199Ee2tC~7{!3C!Tn4C>h!9ZrI}qEvA`n2 z?jr#9j7LCfI-TI|P-YfT< za?9Z}T2b{zOEl`?IZVloc9ohsnlFGzV$5L-%x_UjO*$JugR%C&yRRfbw_^pXK&!#p zuBP8t7SD-W0Z#x-w_La9RdlbC>{^m9FU&#$d~{vQ|2@DvuokaH?#kT+7~$ZSuSbBt z`oEb2t{BXv` nOPH0{d?~f&KOp%p{=d~9)0=YPmf^fP00000NkvXXu0mjfBYt#7 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/avalugg/hisuian/normal.pal b/graphics/pokemon/avalugg/hisuian/normal.pal new file mode 100644 index 0000000000..8055ef92ab --- /dev/null +++ b/graphics/pokemon/avalugg/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 168 208 +80 112 144 +184 240 248 +104 80 64 +128 208 240 +248 248 248 +80 40 24 +8 8 8 +144 120 96 +144 64 32 +200 200 216 +144 152 168 +248 192 0 +88 56 56 +0 0 0 diff --git a/graphics/pokemon/avalugg/hisuian/shiny.pal b/graphics/pokemon/avalugg/hisuian/shiny.pal new file mode 100644 index 0000000000..9e547358cc --- /dev/null +++ b/graphics/pokemon/avalugg/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +112 152 208 +80 96 168 +184 232 248 +200 160 144 +128 192 240 +248 248 248 +112 80 72 +8 8 8 +232 192 176 +248 176 24 +248 176 120 +248 136 88 +248 176 24 +160 128 120 +0 0 0 diff --git a/graphics/pokemon/basculin/white_striped/back.png b/graphics/pokemon/basculin/white_striped/back.png new file mode 100644 index 0000000000000000000000000000000000000000..d8faa1575d9e1ee56aac500aa8c41a420543c332 GIT binary patch literal 645 zcmV;00($+4P)P;e*!0000000000O8R9+0006I zNklFoTN%M8Oh3V>@lM*$*% zv%$Yz1VG2cj$t(bBV<^(h4IjC7y}XHV+Z5LDNI6qEY%2H5Tbx?(+(p--b$chMg@3` zu~8i`k&4hThO{4mZde__=-h`xQ`u6i_mc2&$A`vau)-us;vksyY5?w74(kWEQKA$F zvsw=+H@F2WjB=v)7ht;q*c|i&n0Qw2VUyO!_!C#k09n2$fgnTjF3~>EIFG6&OawOR zPGarz9p`DXJoqE&6SpkD?>PTH`C9hq-#~*dLa1E;E6&%8_=EOeEdw^ZaAA)UQ9v{= z00?ftTIx%HGP=b&ntUk$NX0Y9o(chka$6{Lmq%F@@_k#oQJg48phUEZ+lD+3? z##2SSmV1eieirn~FM(+`h2yjU?!@z40I<~nX-`v?m@HxLBp?*<+gBqH_j<(-fPfA{ zJPEP+Y2`Dz>`}k898lW8mHY5x?8Q#`q5@pOwPjM*LhRu|`dgy}_K%{X2YnwLfTyZ2 fG+qC}PCDriTfkhgu*E~h00000NkvXXu0mjfmPZ>5 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/basculin/white_striped/front.png b/graphics/pokemon/basculin/white_striped/front.png new file mode 100644 index 0000000000000000000000000000000000000000..f16202e1493807f722b352d7288ea877b6795924 GIT binary patch literal 546 zcmV+-0^R+IP)#KvkZgxIzq_sMUe#F1cM8S~Z*^UwBM5@A5FOzHpWbN!@)%fME?<=JGljE*l(!o z(gs)}X4;&Q^5_ksyN3b*#3hXuI5Llz1}e@A0PKDAf}Z(4eTeRG{`CyD7*FPz8QTDq zfY#JMPs2|jI>%oDJJmWTv6#z`v1xcMfe#UcRzQwf0dP&p(=7N)Vu!8@z*cDeq+j%_ zl=6@+h6TV$yjcaZf8YYffeI)uaI%Ca{m9Azuq^;mnx8NX9Y8H6EF@5sTEIJX;F~{A kG2=SG>i`?ofmMDb@9bjVj^@vOF#rGn07*qoM6N<$f`8-W!vFvP literal 0 HcmV?d00001 diff --git a/graphics/pokemon/basculin/white_striped/normal.pal b/graphics/pokemon/basculin/white_striped/normal.pal new file mode 100644 index 0000000000..5e82d654d3 --- /dev/null +++ b/graphics/pokemon/basculin/white_striped/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +72 80 80 +8 8 8 +224 224 224 +160 160 160 +32 48 56 +16 16 16 +64 80 80 +120 168 168 +168 216 224 +64 160 80 +0 64 32 +40 112 48 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/basculin/white_striped/shiny.pal b/graphics/pokemon/basculin/white_striped/shiny.pal new file mode 100644 index 0000000000..766d07db7e --- /dev/null +++ b/graphics/pokemon/basculin/white_striped/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +72 80 80 +8 8 8 +224 224 224 +160 160 160 +32 48 56 +16 16 16 +64 80 80 +120 168 168 +168 216 224 +120 168 56 +40 64 0 +80 112 40 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/braviary/hisuian/back.png b/graphics/pokemon/braviary/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..e314179b2b445519449d874662f40ce28d50c66f GIT binary patch literal 786 zcmV+t1MU2YP)V*290007= zNklc#H5Jf2=2assF3u0+S$4vkgOT=wVEzBy70mXd~u?`g3O9-ygXrWW2 zW3ajbS*cf*8~6eY>;q`?XGz(TOy&Z~g57`o^JjKQ$N7K$#UthH@4!qgr2J8@x80di zi=^JA&x5m{N@@AEQto_ca$hi*B(f6e`|gkn0h8}qC-Q}U(dXO;AOvGlYkfd8Iy~Uq z>OzD{0%`97O?n*>pb9x7gS&ORMV)OquaE)Ag{E`2Ua#6tJI_m^>6QK>gqkAedbM6d z&+}H%B!33dECVrl_j*NoeqUtV0y3UK&U7+m?Kh;GP0MC1fl$qtczvlS%zJzCkmtXR zxi2ynA>#!^0O|BH=owfTV;+i(Abc2T*aJw!mtR+ffqA4kQjOs-gh84Tpr_u)lMM`* z1zwR3hj^|ubpV&!PZtITZkL&^;~ZIlpUY{ySkf3$J&6Vz=!33<$613SVSSplR5XIDG(ZSD#PYh~L36f*wgwcU^#nAmgSD^+ z!0774ecrhvtXzmLRk2UWc!a~8T?0Y)9m}`?NWa=$S|$jPp$M(T4e4EH_pox~5EP#< z>1>hv&>N*LWjr}Wg+tw@6vCsmy}7Q?K|l*U5s0(Vb(Ic_ zfO!Bsxj%p%q8kV%JomJ+Kv^URE=F|*)Tkfyjz_fy4Ih7?<70@fb+^807M3_qp%)y?2rg<3FS7mbT1F zHV?M|t;{pDidlCB;Imy4z^s{W+O7$I0dyI*YnL2U7Fx>1gpIO*1neAO77%*{*igqO zy9D?-pwtEesB3E=1X`>T`zio#39tc+OM$TLfPgke79dm(Br8C*Ndkb6Lt9;#X)8ds zQAvT89RPJ#2B0;tdks{58!PcEHvncssgVHGR)>5)qd+0)UalCPm$haAxlREZgnGwM zdq~680PBKJC8KX-1+?^%u{zk=#7!NvWF-Lz&Lo5kK!NgS0D*Rt0=}P&BXJ1ZBB}%E z**XY>RF_TFY$>#RLi9;;$4-!1Y7Z=7hYO6CM343kYIR1CdQ<`0GS5jmdE9}{I2la~ zSG#R_Uc5{176l+q0Qmybo)j2};SGTD@f(%y$oEJVh%wtr0c#)N0YaU9h-pg~kQFej z7&9a2#FPDT*n*x)i<=TLPR5>UzLb)ejZQ852jx}ACGALkrtR`1k8Af zKzu%#PDaY1C-$-ihV}U5<77NNIsQC`?k<-CeIpmn>*Kdyr(e!SKs`Pf3i2+WH_V6e zw{P+I6+oBwdV;Vg1;E}p`~Lgusdz>mPqn}b64myn^{chh0ls>Ah`U7z=jr_7XInT< zSLMZkxdn;!tNFz}!n#D|55;b`n*A3w%=vs?BgSS!<%dFi=(3=a2QF)_Vd)Aa!#4B8 z_Ei%BL-jB?)Bp>z!(3Pk`GaHR909S309(rt#6kgbKsd%xVog^O;4wOCD{pHG(D? ziN=fT<;>#;?!l#4L|%lSCD{nF0IAik7d*NvqQUj{WhB+Djf@8|n#<*4My&qYtah>Z zpwz9^U#DCl5E+I`nzh<6D)y)bzP!ID=doNKMtrk4CJ9tsCD~khOV07*qoM6N<$g2ctV AD*ylh literal 0 HcmV?d00001 diff --git a/graphics/pokemon/braviary/hisuian/normal.pal b/graphics/pokemon/braviary/hisuian/normal.pal new file mode 100644 index 0000000000..b792f9ab7e --- /dev/null +++ b/graphics/pokemon/braviary/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +104 88 80 +8 8 8 +232 232 224 +184 176 168 +56 56 64 +80 88 88 +152 64 168 +168 96 184 +32 40 40 +144 152 184 +80 184 160 +168 24 24 +240 248 248 +224 192 72 +184 128 56 diff --git a/graphics/pokemon/braviary/hisuian/shiny.pal b/graphics/pokemon/braviary/hisuian/shiny.pal new file mode 100644 index 0000000000..fea7024017 --- /dev/null +++ b/graphics/pokemon/braviary/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +24 24 24 +8 8 8 +64 64 56 +40 40 32 +56 56 64 +80 88 88 +48 176 216 +120 232 240 +32 40 40 +168 248 248 +232 248 248 +96 56 144 +240 248 248 +224 192 72 +184 128 56 diff --git a/graphics/pokemon/dialga/origin/back.png b/graphics/pokemon/dialga/origin/back.png new file mode 100644 index 0000000000000000000000000000000000000000..a9867f0bd801bb6b82247271ca2836093153adb3 GIT binary patch literal 623 zcmV-#0+9WQP)66~u%MWzZ~y=R3n?&d0005{ zNklyKLhC<8xI>up&=YB=)VAo6%6L_4uIg&V6`hMM+U?QO{wB?+V0`>xIvd$ZF0-KfP1gdmp1z>#^ zdk2N>A)s7sFtOMHTq43_K+|ZJF7_5upauA7Lh=Q5mjx6}*s2Y%br^^kk(x;|s&)ei zvI6XY!{pTkrEo^KMo`#CpjiPjI5&X<+6Y*T5s-i4m}(@n4UrGgTV!Bz^@t0=Beiyl zz+f%k^>ZBNLDOXI^Gc%!y0^8?19J-jcwI*wfExp$mI6=Uf5rg7n*og*ptmn@5m0cm zjrPPGLD&5g5&+&!*unzn{v|;8_87P|nipY~@5TchA%2`413ZFMz;Hyq5tpSnrsLo) z0q$JKWtpnGIB6}30FEDU@?Jnvl1l{E>mi0ntQmU1YJ0qdNd&6TBN9fo7zElKAQDd3 zBm@iW0hZt~2{1|v8NjFT01N00;8XZ_DKp5_D}<)@Z=VGc;1}GEuJ^Ih;~xM3002ov JPDHLkV1jm{0S^EG literal 0 HcmV?d00001 diff --git a/graphics/pokemon/dialga/origin/front.png b/graphics/pokemon/dialga/origin/front.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7c7aabb788c38f2805ee57746e796a531a3d01 GIT binary patch literal 1072 zcmV-01kd}4P)LimUl@-N({sLM$%k>o}Mc1E@-0?Tun`K#c!DJ9C?|Yy5z8~`#GnTG{GJQ)=*uHh} z^pvru-tk_5eEP&Y{Q+>Q&phGmkKpNAuMGYD0{V#jpdN8?&BXD6egUU)4ql{#z$iht!aw4)J!_rd73$$i?y!2rZw0I3JB;?Q$X0)+)U{<^}kbJnzA_UcraeoLvphVMq z;K1HFGz8C#?GJ{fLjw9jqzZ+a1prFMPE;@;fU3-1B$X#|E1Ob=w!%`&K)y|}gfE(9 zNyj4_DEr2A*=G1&DVo)lzb^unPy9t~oC!ldi680_M#o8Gd z)jYC*?=7}Af&gwMwAlje z4iyq$6eFVP(N8%WqhMpUMeiuIR!)G8v<)<*eL5?k&L2@&1I)i~)_Jv>1*9!Y$^>{_ zb(+e*yWap;65a`Ch0$y0?*1p$sb+xpSLg5U?)e(vlST4K72bcpu2x3|-mZWL3p^~- zB#P6k^UweNJ^JT-Tpg_e)}3U4%j@Z6IePp3^6sOxb}wRV158HasqVJ^J)eGzw{_z{ znGj3WS$4)RuRl*GacVJ;JmWP{odqZ0db-#L@C6@PVAQeJ)v)XU-G|Onk2hAH`I9ll q6n~&k?w{S(B9+At0jt8)j`e@y|5c%d*%s*l00002;j(wdYqHT0004x zNkl+;kuSoCpeelJ*QUT48i++Z-QQIrld2tY4nd9aE*2fY(*RI(34xoSiD%m} zbW_-Jku5ba^h;bhHo!X-_M{q>u$XBe^@i=!1V#jGOV{q<$*ThT0p4l%1gw7p>00tr z0f#H&Fx_iFo{aCE^dk2k1e~Qjr9*#;-*+nlE>cP?%Dr*&Hw^(X0`m0Z+B79M%~xar zd01`jX{OqiyQVpI0P13NHt*lfQT>fPu4P!8X1$C4i~ayC%{%x=V!HSM0000in)6onO<%(y}phFZ$Vy?vz&l#W-SHqu4(A*x|AOad?9wJFocspv2Q zUI4!VcAkb8;NF#Ful^{gb7ow4&!=;Lb`9e}{~?prZ9j6n5Wt^2?(&C;2dq&$L4NX< zY#(6OMzEh;P8HCaF+3+A3CQK&q#2MXfSd3F@PkIgFbNodDHB5AtPzkzT)u%FCSmwFRN^c5d^ye88PtOj7aCs0I;O~eLZnK)4Z zUBjqf02Z*X4 zAN5T!aE%0D{DA;hgj7NA;R*)$o^K$S5#Uggr~_j}^_Gx*RRM8+06qdZt{P(OIK^$F z)PdXmRh94MjnskO>K6X+C6{_GN!qH9S1Uq%5is(C{>TWtr}4Ef~fP z`JXqN&GO(^fu3A_-;uUiY0LDB4jfDQgZ=Gxo!g7WqVnvG^^!W+-QVwi72l_K72mj7 z(rK3c-2E;S=2f7VpD(kbMw(VDP>rIuY~32LkC3uRs0UCNQdc8@Ce?{~GoV7W`Wn&U n6Y)v;U%PzLHLKfx&_DDS;Z`N_d2MJZ00000NkvXXu0mjfo#QGC literal 0 HcmV?d00001 diff --git a/graphics/pokemon/electrode/hisuian/normal.pal b/graphics/pokemon/electrode/hisuian/normal.pal new file mode 100644 index 0000000000..e414980448 --- /dev/null +++ b/graphics/pokemon/electrode/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +104 72 32 +152 104 32 +240 216 136 +184 136 40 +232 176 80 +248 240 192 +16 16 16 +184 48 24 +248 80 32 +88 0 0 +184 168 168 +232 232 232 +80 72 64 +128 16 16 +240 216 136 diff --git a/graphics/pokemon/electrode/hisuian/shiny.pal b/graphics/pokemon/electrode/hisuian/shiny.pal new file mode 100644 index 0000000000..fb741c2d56 --- /dev/null +++ b/graphics/pokemon/electrode/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 104 72 +152 144 80 +232 224 184 +152 128 80 +184 168 120 +240 232 208 +16 16 16 +40 40 40 +80 80 80 +16 8 8 +184 168 168 +232 232 232 +80 72 64 +16 8 8 +224 200 136 diff --git a/graphics/pokemon/goodra/hisuian/back.png b/graphics/pokemon/goodra/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..a454fcde6556f0f8a122086e12736ec223248404 GIT binary patch literal 882 zcmV-&1C9KNP)an84`J=nxPP2&p6Z00090 zNklzxfNl$KN3M%9*a56&zG>4Wdz3ro{Z(j4rvEV@*voM0XDE9{CG~9Q3Ovg z4Mcp$As|3qN$3$a&+&gpK(mXpnn`7Vo}wXdI}{GZX~LJM0zlKeh{0OUx7;`k0kq*_ z3+o`c5DFL$V^ol;pcDh_`*{M~xX${o2>D3`21ExHT|QCZkl}K1notIq@%wrELEhLy z3HlrT>e5KT+=u!RQ_EGN7M?0#Kb$zv*BQ{KaJfjWLSI`FEY2SkXiu;_8Zz2jMiJb$ z?3n@%fO`%2sNI4Hxq57%L2&yBJsfh*_|)MyLoFB^s2jt1T>O5LfOD^n04^5>F!ojg zv3gno7(;#9=CF??O9Jw^TBTsZdKoZ~m+>P2KLLH32R77KYXv+$=@$|N)FVTIF`sPp zFinf5XIGj{H05vt0yMe8vn0X?afW1oboU2j1L#)B~5@NdN!<07*qo IM6N<$f-B*O;{X5v literal 0 HcmV?d00001 diff --git a/graphics/pokemon/goodra/hisuian/front.png b/graphics/pokemon/goodra/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..edd5e3c3abd5da6cdb9062eeb198351cab4f4b2b GIT binary patch literal 924 zcmV;N17rM&P)an84`J=nxPPnz&Y#0009g zNklau;l#9?9x8@*2~iMEL%?x_MR7AU#9cZClLH$vNEi-E zhk_wE&Zss>Yg0^d$k31>MD-VFnxQmP&3%`?lmF>tr*!CBZ1R5h-n+9-k);0=vNHOj zDD!~|nPDDau8;vV%$Iw1<86%pu)fAf@@FDMCun+y}ZW0vUmVbb86a-*X=iv6HIRO~HQH;09(;s0t2Ei-{F)Dunk`;#5 zVd%s7(Om}!~_qUCMlT0H3Pa|GRPV-;W<^M&5Vm5^WPVxINL#pM`;;*4$t zej~uQkx^(N5Jp&lr+q$Tjp1qPM(6Chm*@b%0o!C>BXE9mB6d&#?pPFf-1+U!c_?-e z0aOr(9T3oFl)vYfxbo#BQ9zRE2wX)VOcvmP-ZIu7*dvfA!0#@_KM(r0i$hjs3gF$u z9(X$kHg&-Xzs(fDn}b@vpmZT3Flw0000&au3vzE^gfFCyuDu}St#=p0lz~)vjF2k$ z2}1HdX*08Xme#Ul!Es#{EEoE;|35ST?riqzYdP_Lo=yOZDIm@!H0~yVIb`~_1%TT? z41l*ZqB{bjX#72_Vla@65fK2a_yNNzb7f_f@!18-_ z|EuTm3i$Ko#eny4|9d?KxGL(?&&xW=q~Nb*j+n?j0oPS9P@olPQOftIn9|*lk{C+ zF8MBlR0@}~ha@k%Z4A3OCNs(?C+FtDxYd{(Tf`-8N6Zj%1QE1vST#_R6fMtuSA)xD} zI}(;svs9+p#|~~KmuwvZ;C-b+5hkQ2S;R1znRcuApigX M07*qoM6N<$f~Ke~2><{9 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/growlithe/hisuian/front.png b/graphics/pokemon/growlithe/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..c0d6232a95a5c612d3eb93190f8d3b001a734dbc GIT binary patch literal 701 zcmV;u0z&HV{6vbcUW+w)#Ui3DR*MBF{<%arLUek>hgdoXjS zHta~MAG2$&!nEbzR{XwvwD|KK&i0di7znpXKy(Z*;{iF5Zo_?qQr+^Mt{bx^g z>;TXj(F5A-@8|%~uj38D?#P3@wz9gRL*3(86n%Izssubrq2C4$_<7ma4QK+6T>xXr zt#Tmn;s($y0AqR;SXDyIPzSU!!sF`?lS1HmNCBc6U_&tly(s_>bWZ_X^AY6CUT%R7 zI)qI?TP%A$jP_(w0(1yq*7u;jyG_%N5YxB>@-iEz8L%`>Q6q`AKvD-fmnR6MI=sq( zun=ef`|q*+{Tq(IU>4ag1nL=yyJWZN=T!*tU~|sc8TJ*xzGnTC6}}C!S;p6Hk~AEM z_TtOUv*jmu;RG4aHZ!3J5W<#M%T*FFDaG;35z>vUCP1{WE7aXXz!8p=Ozo2n%Y6}$ z4nDHgCp#fdp1hP*wE?}@%`ZT-fL^&?S^J{6H@kKrcxSugNbIpEBh^py}=?1CBL0XUxs z{P&SmQ?iFi61$6|4PQHsMf{dW_u?>NuPrjj*322*0gPvBHqX5><~Vb$opQ`Cepm&7 zw-VZXu4L%)X%!1EiGUC)5Xj#EE{Um&vQPceG?!|h8mF}T<^4{_!JPons<-yR)4PGK j6a)2BXd(CX|HAqSJE_V@Gi=O@00000NkvXXu0mjfTu4HR literal 0 HcmV?d00001 diff --git a/graphics/pokemon/growlithe/hisuian/normal.pal b/graphics/pokemon/growlithe/hisuian/normal.pal new file mode 100644 index 0000000000..e6d97462b5 --- /dev/null +++ b/graphics/pokemon/growlithe/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +88 72 88 +200 192 184 +16 16 16 +120 104 128 +104 16 8 +248 80 48 +184 32 32 +160 144 160 +112 96 32 +208 128 112 +184 152 120 +224 200 160 +72 72 72 +0 0 0 +16 0 0 diff --git a/graphics/pokemon/growlithe/hisuian/shiny.pal b/graphics/pokemon/growlithe/hisuian/shiny.pal new file mode 100644 index 0000000000..3406fee673 --- /dev/null +++ b/graphics/pokemon/growlithe/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +112 104 96 +232 232 232 +16 16 16 +160 152 144 +88 72 40 +232 184 128 +168 136 48 +208 200 192 +112 96 32 +208 128 112 +184 152 120 +224 200 160 +72 72 72 +0 0 0 +16 0 0 diff --git a/graphics/pokemon/lilligant/hisuian/back.png b/graphics/pokemon/lilligant/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..aefd8b022aa5ee45c9147c22248fc49a6f2416b4 GIT binary patch literal 814 zcmV+}1JV46P)^FhE%N`1m-maLB;8Ab@~ys6de5P`Fr_VIeZk0008H zNkljrZLnk5? zMf?|lR7Kt^51#GmJSLNG;UC~RiCcOXGa}w%$=}btUw7|m+CQ|$zTW>UU|R2OO*^R7 ziD@|i zuvn7Z$@&xY%5T1%p`%~81XKqtL|g}bL&(IKGNz=UnMXf5U34-7zy|%3QUyLN0rVPm z1}{SrWHQjkhp2<0#+hS>F6V{hqG8!HbnF1|9b?eBkdka*0I-9hMvOhqb0Nnt2Q7@- zxHM}Gq)L*w0@}O;s0P%wZk#e3%WzvK^=;9*a@@46S{}ExK0$KnURM`-KmF!_t9u!cBWwiL33;8xT z4H9{tXTxZ&0^YXCMNyCl03iW-P~B4o`eNRn${yUUJ_bEn+-Q4B4(oT2ks;{O4K!&Y zms!3TQXY>Y(pSXF_STd#b`QE=?ug!b9kF-WJM9_1@wASB^B;PrV`4l#+YL-669BF# zq*0p%={<{RzgE`t(71|dSP#(8B)X+L_D|)2g;{i)?%GfroiaBY1^}>~%>*5W6W%L) zS*SYEY0Sc4wFRzY*@;fe=@kL@co_rcD13x~4uD%s0pNtevR)&Pbciro!Diq*rOC$P s`<|A6V%DFo)>D=06#+pP34*&oF literal 0 HcmV?d00001 diff --git a/graphics/pokemon/lilligant/hisuian/front.png b/graphics/pokemon/lilligant/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..6699ad47f3553462d6c5c9af632548b46f5703ab GIT binary patch literal 705 zcmV;y0zUnTP)TxLBC@*gy~v5Kv$!Fjz47`1nY$K*+$jNPtLqs4$4=D7aXdcadxH0006^ zNkl_K!jA!zC#Px4q#y1$|4YDtjp`7K6#KfHH-Ivb&>Ta2^|1xy z$idz5J(N2me-%vAjU6ZX2)@L>H^F^MeDyqs*0&&N$3Mt8Ex3;Nzk;Q`UXx*v2q)?L zSlk#}aNeVWrrzUMwukBCrNKueCL6BzkaT=Pb2cII#AXSbU_6PUNuLms`9kT}7_}+DRA$dWXf%sf z;euo4XyjttT`=P0R~ne}Xd`r)RLk6t|`@+$(I8AFppk-;A n0Rl}cKsn-sL$Cq;^`!HEXh#Gpzd$@V00000NkvXXu0mjf%}q&# literal 0 HcmV?d00001 diff --git a/graphics/pokemon/lilligant/hisuian/normal.pal b/graphics/pokemon/lilligant/hisuian/normal.pal new file mode 100644 index 0000000000..4160f1ed62 --- /dev/null +++ b/graphics/pokemon/lilligant/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +184 160 80 +96 64 64 +248 128 184 +184 88 152 +248 216 64 +16 16 16 +80 96 40 +48 88 48 +248 248 248 +72 176 64 +200 192 184 +72 128 72 +120 168 48 +136 232 40 +184 88 152 diff --git a/graphics/pokemon/lilligant/hisuian/shiny.pal b/graphics/pokemon/lilligant/hisuian/shiny.pal new file mode 100644 index 0000000000..0f934d2ee3 --- /dev/null +++ b/graphics/pokemon/lilligant/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +184 160 80 +112 64 32 +248 104 56 +184 96 56 +248 216 64 +16 16 16 +96 96 40 +48 64 88 +248 248 248 +56 176 112 +200 192 184 +32 128 128 +112 168 64 +144 224 80 +184 88 152 diff --git a/graphics/pokemon/overqwil/back.png b/graphics/pokemon/overqwil/back.png new file mode 100644 index 0000000000000000000000000000000000000000..79670b0601dd47f35736c8ae2ed62d1b1fd91f8b GIT binary patch literal 605 zcmV-j0;2tiP)6pG5CC9S6xSY6L?0rhM%nz3nh~P6R&i>q)s>MhmeWJzDRN~Bp2w{p zA@?pfvtYw6n{y;r$wtOKzCvWU5} z3Nhp%;(8^Y!2I%nQsQc<)KdvL*K%*b5U^e;rS2PSa`b@`>2v~!&9&rV+{o5#`=-=0 zoqVk_AGmAVb_ZsY4%DMHfZJ2AYzpoSm@{~OQL_mM-&&r5!5UGi0Yp*6UrY7CGhzp* z1pg^1Xqyry<{JAB^ieZTg4vhLM5DZ&zcAqZiVupG0-?|qwF+-^-`C{3xaUJtRA!V= z|H38OVR}K;k1DknKt4RpX0UOrdBaC*aXa^b@ml?G0hRn6{0IEmZsel{+&o44F)(=> zgcf)`1hxmjs|Q#!ymvs3gv_!@hYi+y5g}%i0-Is2qs0jHX#<*0L>Khf*LHUMcgv?h rMX$mr(G28nefoGepwRx;_VHq;6aetEJRn($6qAUhn~9jMxO4!faI|W>B{?Z&OCz~mtA-kNr4iSi z3~Z6wESwoCZ};fLQh|{wWh=0>|48pJP4Nd_Hv=WV=7{VPWY>dgP-x8wX#b!ZxU~RdbEVaIJj69q7PtsM*6;rnF)>Af z=n04VlBt9UaA_1GKsBVu?FJxoiu0kevV;`Mc>o#&ix%`y8|q6T6nj^tZO0)*OrqQ2 zQw|S~bY#Dx*Myw4MHR)4%%Nh8o!skgR|tA_lDT{w-IQ1WdG`@_YCS@!)5O*2hEz;Q zqw}=$jFU6krXS*~ZeG=IUvx=b0@`fF@+i}M&q=S&xM+g5lkUoCuv^C1=LJZ}qfF7| zY|4I0Kph!xbP+4xX7PA7{W=UlgOF2vWEl3|-@`KG_}3TRsFCr6id{)jIJZ`h0P;L% zKN!Qn|0aN#rD}zGeG5M5`UOZpWrWknIRSu2_8x%004*z&R&*kPXO$(Gw4$#o`*;Cl z3`Xu`9)2C^S#cAz;>)zpXMA!ODQ^_;6U!?3GNybC{hLr;eB_oq()DK&0E2$00o4i` z(qJ+WVl-yp#qL1{8}uab%L3da0p=!HVm;P;HCjJCI2t+ Y8zMgrh1@Z|)Bpeg07*qoM6N<$g4^v(dH?_b literal 0 HcmV?d00001 diff --git a/graphics/pokemon/overqwil/normal.pal b/graphics/pokemon/overqwil/normal.pal new file mode 100644 index 0000000000..edf871d9a7 --- /dev/null +++ b/graphics/pokemon/overqwil/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +120 32 96 +240 72 208 +16 16 16 +160 72 200 +96 96 104 +184 56 152 +40 40 48 +64 64 72 +128 128 128 +88 80 56 +208 200 176 +176 168 120 +136 120 88 +248 248 248 +0 0 0 diff --git a/graphics/pokemon/overqwil/shiny.pal b/graphics/pokemon/overqwil/shiny.pal new file mode 100644 index 0000000000..d791dac4eb --- /dev/null +++ b/graphics/pokemon/overqwil/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +120 192 168 +40 48 128 +80 96 224 +16 16 16 +96 136 216 +168 184 208 +64 64 200 +80 80 96 +136 136 152 +208 224 240 +64 64 48 +200 192 184 +168 160 136 +112 112 96 +248 248 248 +0 0 0 diff --git a/graphics/pokemon/palkia/origin/back.png b/graphics/pokemon/palkia/origin/back.png new file mode 100644 index 0000000000000000000000000000000000000000..1c3bbd210c4f386781e2e04379fab8cf37e01527 GIT binary patch literal 739 zcmV<90v!E`P)4LE3(X@JJB+6cR>yb4y4N`X!X046CtUqt{Zl1V-4a zU@qRgMCb=_JQakccHfM#OHC%Xz3dab{D1S_`@eaUO67l!T2QVBez*KMrDZ_Pr!JHL zHQxm&1C(9@)F_k#zS3c+O`r;Ztp&0KS|CdRJ)!}sO1^8@F8Njnm{KQHhE+%ypE?pn z6|e>CB;SsTGRPKuDfb3U*P|o#!DB0yp1xlK6Ck$IALH2&hmr$A7&j<&*bg>a4J$P} z*G34T+wfq(X3IrT@#rN`HK1)%ix|Oj5?GjPcmdQsfU)!t1caEBx;X%+pt{T^m9vUK z+wPtT>+-w;Ak1X9nb&a)08K;5q;QfU0!DjeyG_1!u_+Z#|-G`fs@P5i`FIXyn`lq z8Q|f0w4tAqhaKF%Xn>jo&;w}|+a&VS;Bk*7Nt_>4osGD!OtcqCk}!5b)aN^{fKEK( zJV{o^!xy6d@V+Jl$6$4$4QnCsOMD^bAH<+N`Sb^Ax@CNk{5*=oU%k1*#{dojMwB9f zDVBY)|6JQDU)yqsZWEfRj7^I@P$3rQA}wyp?EbA2Mq42XmWmGq;tZHRN!|1<2qPhO zDoH93SY{S@jJIRD2(V1YzpeP4B*P4tNFDqJM1+tlc|2W{o5Nz2H8Bm@*u@?jFyI(O z0@vd8eR?jjVV*K!cx?&rr)#kmZ~dE1G(6qHM16k!F0TCaM9g20`~H>K=dSFZ#2=TF VILfr&0672v002ovPDHLkV1oT|QV{?E literal 0 HcmV?d00001 diff --git a/graphics/pokemon/palkia/origin/front.png b/graphics/pokemon/palkia/origin/front.png new file mode 100644 index 0000000000000000000000000000000000000000..3147470d646259760385d78c4baf94d0b9a768e8 GIT binary patch literal 1162 zcmV;51abP~T>TF!)nu^6ey5ebN78X)h!i8=QE+KoA z_a22AboU{1`>ePrgnv$pBQ_aM4^XSpqf8) zq4WE<(fG@sKUM&qJjs;!Ao!Jn9`>T?t_Gsn8dj=#>{2GBX}`1NRd_s_HEf$JP*dX#uCqsjy{StbrZvBDiUs6o ztmGv{ku-{@>}3FTs15ZXnkfCKqi;B%;6CAy0FD6`0uu(&D?942wt}0thQD4C?@2XE z?HYCJ(Zr6%OmFNcA|eT(7N@>V@yCL}1o~r!5n^+i9)^p6CQ#pUYK{#H&~=39<3Ul58z`i>e_&a8escbijE(H(|i1T;}VxIK}c!8}kwmS*q604_#fGJ#_j4=_x zV9NWrt#nmiJp{m=KnffbRYfpl{YeHWfB+XjZH_G1Qw@y+Z{wDP1EmUP9m&@hj_X0d1*p}1tWbqvlzYB7yv`yXvlAabHb!!W` ce`-Gd2l~gfW-ZmiR{#J207*qoM6N<$f+_4K5dZ)H literal 0 HcmV?d00001 diff --git a/graphics/pokemon/palkia/origin/normal.pal b/graphics/pokemon/palkia/origin/normal.pal new file mode 100644 index 0000000000..428dc93d33 --- /dev/null +++ b/graphics/pokemon/palkia/origin/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 80 120 +96 120 144 +200 176 208 +152 184 200 +232 216 240 +152 128 176 +192 216 224 +8 8 8 +104 56 112 +216 104 80 +152 88 160 +184 104 208 +240 160 152 +224 192 184 +224 208 200 diff --git a/graphics/pokemon/palkia/origin/shiny.pal b/graphics/pokemon/palkia/origin/shiny.pal new file mode 100644 index 0000000000..f520c1e3b7 --- /dev/null +++ b/graphics/pokemon/palkia/origin/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +128 32 56 +128 112 192 +224 176 176 +176 168 216 +248 216 232 +200 104 112 +216 216 248 +8 8 8 +128 32 80 +216 104 80 +168 48 80 +208 96 136 +240 160 152 +224 192 184 +224 208 200 diff --git a/graphics/pokemon/qwilfish/hisuian/back.png b/graphics/pokemon/qwilfish/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..48a01e06f23fa0eb379da21b5aa51d1e2357a45e GIT binary patch literal 606 zcmV-k0-^nhP)-A`1r`cxBvhEMSLVV0005$ zNkl5pe1M<_7e!(!6`dI_>5S>Ky>*~59T|GiIZ~2` zyfG2+Au2H?%7^OR#diJ9f0&VYi~qcz-+OnqgW!KWMVelB=arguiDydV)vN>DT;g|q z)luRG6C(Ysy~8CE(K>1e)7SvQ)*eD9v_#bHz>E;nx}$;tX397$ZXER+08&zd<2ul~ z0*+4myoSISF?bRm&E(TM0iViq=#|68N`IjSUEBFz%6+~@*X{^#;RU{1De-n z@WASCz?AU+qzMO$+TUD){Q>w}-77$rAHf5=p9R=hl5IWE+bnXhb7$LZ;T0gtd+dI> zlg*xkJwO4#9e(`wR}qK<_*0DfP!nt?0Q^s`Ea75XPn&=;pEWdaVw>;tWYY|K@YX&K sBe81%^Z)=hCt5((c)J3cpZn+I5zfI@mI+!&*8l(j07*qoM6N<$g0lA)*Z=?k literal 0 HcmV?d00001 diff --git a/graphics/pokemon/qwilfish/hisuian/front.png b/graphics/pokemon/qwilfish/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..a32988cf7d8f3966b9e70ec7d74474650d0a5321 GIT binary patch literal 571 zcmV-B0>u4^P)USXf|~h)}Sgc(}m8SWqbV`1rW6kN^Mx)+dl20005T zNklX2&E`~mh^LU?{W-}k;xBE(EHMQbjV1bj^b z(n&yOB>{lF>44gjwmHTBQfs@-B|G*QHH+9@(B&JUI)`CbO9{Koz2*vp3K?AnXM(4yxkMCRW?1Uq}V}k+kidaKlhg#Y$(Qz11 zDh;RrG>RyZ4Y&0B9U#_R04PHl+cGx>K)wUA$Uv>NhA8EsaD6E|_QVlQw*`Dj_XSXq z`lX2}gtGnz*=KpHn&$i>>UiOu&JWff@Kr4^(vmue6SY{>yykRtbcD@(PRgn|S(`FA zFK9YCf0waR%pO(E50xqByGGu-eq2WH=-@7*QRVWVmeDt^e)1mbk&U0-78dnpemo_e zMgjM|!jJI~ZAo2P6T>1i@g${*Z|JF<+%(`Taio zmLEg|OprgMu4(mR0HK)v(7fSC9Ke-4#e1(ANr0I4=gss9^bA6;ss|~t49x%l002ov JPDHLkV1i`K0h<5- literal 0 HcmV?d00001 diff --git a/graphics/pokemon/qwilfish/hisuian/normal.pal b/graphics/pokemon/qwilfish/hisuian/normal.pal new file mode 100644 index 0000000000..b1a2bcd32b --- /dev/null +++ b/graphics/pokemon/qwilfish/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +120 32 96 +240 64 208 +16 16 16 +184 48 152 +128 128 128 +64 64 72 +40 40 48 +88 88 96 +152 136 80 +176 160 120 +184 192 192 +88 80 40 +248 248 248 +184 176 144 +0 0 0 diff --git a/graphics/pokemon/qwilfish/hisuian/shiny.pal b/graphics/pokemon/qwilfish/hisuian/shiny.pal new file mode 100644 index 0000000000..79d490248c --- /dev/null +++ b/graphics/pokemon/qwilfish/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +40 48 128 +120 112 208 +16 16 16 +96 88 184 +208 224 240 +136 136 152 +80 80 96 +168 184 208 +168 160 136 +184 184 168 +184 192 192 +96 96 80 +248 248 248 +200 192 184 +0 0 0 diff --git a/graphics/pokemon/sliggoo/hisuian/back.png b/graphics/pokemon/sliggoo/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4289b1b2c32ac4f7d7c5aabd3d94b49b89608b GIT binary patch literal 606 zcmV-k0-^nhP);y40)(W^=vZ#+S zI%{izG5}P0sJp@$=m<*~T@jrIDj&F%02an4raO)J9vNeWdJFrIzdOlr9{?N7S|j0m z2!L9>28{QqphVa0P!O7Fc{9Lc!DPVu4murduP) zOFLM|gnog30Hbnr3f<)H1=CLu@)`P`&Tb^-&d{wxA27yxe)l|g?^%}hUw<$A;by<( zKHUsDZlL@%cn^TX(g(MzZvbC?fp=&Cx+=$OZ)%_bU+>=m`T_#VYR4F0^+E|8gZ>DV zy(fXzp0QyK1g3@-^eEi%O$`zVY#X{pfELq?pl7~O2ljUXdZs;6#|zhmPPhTsCjg9N zu&lNMjDxh=;O_c#*AaiGZ-RT8L|E088YzfFqox7ItAu= zJtA{mL}rH}HIT9-Ni+bSvz=J_mqQ`)yxOsiRDpQrg^zHQjZ#5M>OiS8@E*@nF_*rW zSI3zt;1k{USgce7uB4p|9Dq)L4e%ul~Qc=(kuFziyX{?i(; tI&t5x6FQ#=#?+9eOzW>0lF|NG^&9Ee7Ck}yRDA#d002ovPDHLkV1meLFpvNM literal 0 HcmV?d00001 diff --git a/graphics/pokemon/sliggoo/hisuian/normal.pal b/graphics/pokemon/sliggoo/hisuian/normal.pal new file mode 100644 index 0000000000..5f3e5ae0cd --- /dev/null +++ b/graphics/pokemon/sliggoo/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +232 224 176 +128 96 112 +240 240 240 +216 192 208 +168 152 168 +8 8 8 +136 136 136 +72 152 80 +200 200 200 +64 64 64 +88 200 80 +176 176 176 +168 152 192 +64 56 88 +136 104 168 +104 96 104 diff --git a/graphics/pokemon/sliggoo/hisuian/shiny.pal b/graphics/pokemon/sliggoo/hisuian/shiny.pal new file mode 100644 index 0000000000..9cccd5d391 --- /dev/null +++ b/graphics/pokemon/sliggoo/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +232 224 176 +128 96 112 +240 240 240 +216 192 208 +168 152 168 +8 8 8 +120 104 56 +72 152 80 +200 176 88 +56 40 32 +88 200 80 +160 136 72 +168 152 192 +64 56 88 +136 104 168 +104 96 104 diff --git a/graphics/pokemon/sneasel/hisuian/back.png b/graphics/pokemon/sneasel/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..ea1be20c851560c5bd2d2d05b6babbd60847fd7e GIT binary patch literal 591 zcmV-V0|ZGc4r0JFp>Ns`b4#GVoGeV-a7 z9^%*nP)dy+3NT8zHvvYE(k5XAv`1j`@QUVpnqm@)Xn;zrQ4=5nCrwi>M25HVL8})b zxTqNp5CVI}8tOwpD%4_Z2ypUaeE4>6uaJxcEx2xRR{Jsx(Bki;qjCwfd_do8FJb|ie& zqyE1P^-SkESe_qQsT3x)@?Lp*>hL={hGKh2+Pu45#j(rhiYSl4J5px|+PhNf$mcqk djmi99>kk1V)w6KHYuEq)002ovPDHLkV1m2x`iKAk literal 0 HcmV?d00001 diff --git a/graphics/pokemon/sneasel/hisuian/front.png b/graphics/pokemon/sneasel/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..75e3872b15cc67b231ff9c701bcebf9c90cc710c GIT binary patch literal 682 zcmV;b0#*HqP)yzi-+=6vti5y1534IR=RxE>c!18BnXxDMyIZ!4z{e5>c1HrF&8_bPl?T ze;`W!f@CE~L~lgd=v1*~tGZR{^N(~m?%X*y*qHB!@B8}QJ1pzvE;pAczjA3cOSkis zzRuP?x|0EvXpvU*l2eNeXfdBRM5rG`236Os7%C)y=eh;GP8h3M_U;=u7Z@Ti=KFTD zTQKNW-xoqO&O(!Jg{X_cDKi0NBoC1ow@n6bkL2`dDwxsXSbo2f(=#LBNO^rF4=)%q z)F4vcEu~~eAe_ltDdoH$19q{vqX4br<&9h}!q~yDQ#Yp&?|;kX?6S4#v%s&jNu}s1 zJL3Gp0-x6_#?YigX{De7m~giF!&w{dS)2Fh)|TyG&Hzvx!h#1DDQyil8Tzmfj02B< z+Ew2IiMbDedh+y9(+UoAfQ3eQ)_p#FxB)fWzXBmfgooRE1Axr|jy3K;zZE!5=iDM6 z;94J|yeCeBXl&sf=xUUy*sI~)`34IeVB=}sjXpSEu$h{PDphH6oE;$nx4WhSUWq1+ zcZ9%^V_#Lm>!tq(2;k6mCg*B~UL~zN5P~(r&P0vTb<=N}V#EXT=|TmFTYd(3)Q#zl0007t zNkl6u5g($-LBFrD=Y3?tQYP9l(7r}mnl*lAy`p&Z3KCaaEA=B z8xy!K?iubGjw9fMy$1+{%&z|It}HH9x(qH1^V@H}otae-{EtDze*+TdfBA6)V2(ub zWrSc9iLHAXOk5(TU(DGxA4G!g(+Rec3b4DVooph&O^faY9@ zkm?fJX7U1>@Ff@xLPpR;NK)ttD-lL9<|7`XObe*`TlL-oJjU~ph|x!zSI7F=)?gjL zT41eIUDvh-MINDStN#dWwuR02e%k8RY0uN_pD>1RE5ICU}~>Dj-)+GMLD1 za0<|jz|RsZ;Ni)>1vq7#w18m5T=May-6h>6(F24I02Z^zo^OHsxdTuZiQal|F$BI7IeuU7WM8hC6TElcp literal 0 HcmV?d00001 diff --git a/graphics/pokemon/typhlosion/hisuian/front.png b/graphics/pokemon/typhlosion/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..58c7f9e41755a916e377adfccc80b323da4261d7 GIT binary patch literal 872 zcmV-u1DE`XP) zNklbSVP^K}vYfsZ#8_z&o5GKfgTB`<`D})9$ME@EzZqW#VH`9AH%NWK|D59Xnc(9+m>|v7;j#;1Y(zQTkf}!U)?K zN(JbaZP}=dY=E$;1SK)%3+BkD z!1R@^18@jG5mJUZf~;P^$bK4z0PKeQ#KO3k>%ek+yB>ynEdHkQN%r&9=`}Hu|xcDA#)0*YvWidsie!$*d zL?=6RA9;Eye~%cu@AsG}PB$Ih&yS&F5#1TJ92) zGe)Oyi4T|Qs!P`b&b~?py;F$4dPHBKCv>MT0|slI@gDEd3VuRceI{iX>{I}};akhw zoXLQ8Ha>10iEAd0`2YYpquFeBpidrfe$!W3d}|(Q-FEu2ZbmA=NIF`VO^Bqg$Pfif zmlB<>%3=br6flNr03N3n9T;1cVWw*j#H}!EcV+-A1&nxjGYeoGB=fxcTiHTdVjT=a ziZG`DljB82_keOI=U6lal-GDKt1ZmG_1U-d4`A+pz%T=}QHVJ{LrioTd6e2FAi55z7lMgGAODv@rRb0R$W8bTf|G)YcgF ySt~cE8AZu`tTBw^{5K@Yq#E5w?jlph)b9`BvgA36F`Ov?0000s_3X zIDzg+-01uK`}gllCX-h^V?~Tj*!&;hES8a2J|ZIK0rBy0``p1Q0tD`BoMQqwfQ;^+ z;(!1KFy~@<&wzt8!vZ)#B1RH#;^@-cVrAcWN-_rG6-vDUHztlt`#YHf_sLG7;x?09WYfm3uA(SRejCrl^o_n1%smpHL$I(co-@as92>^ItD40tF20000O~F literal 0 HcmV?d00001 diff --git a/graphics/pokemon/ursaluna/front.png b/graphics/pokemon/ursaluna/front.png new file mode 100644 index 0000000000000000000000000000000000000000..954e6b8020eb41ceb176a1378a3d02e0859ac6d2 GIT binary patch literal 996 zcmVXU_=mJ#1DZ|oDa%ss1hk;caS~uy{R+)e{v>R|EPzI=g zFwyO7b<`vl1n_69kWi5K09M{6a~5y7x1n z+gN#A1!xly7us&0`ui%#01D9}orsmBgxo-UqY&pFC6FD~okk}Co*?2W7J#;ttlO}b zcu->Wn~29*lX4q)C&5`^fOYh{IbhTzi7j?nQ3r{RzHH`z;1*hxV!NaIn69vy$E;QF zPYH0QwN8)%eGI#PHfZO56#WSdNRi5Tg5hcgR4=0FJ&mD3-HNXm@X+^ipuXcqQN%rR zTpj?r=|I2cUJ7jW(RY0*yQ#~EP%{=>z4?yoId)h&t` zcFCYO7V{WuH4lIK_#qDAaF3y^hjJn^pxmP)f3Vkzoq^Hw!xxo(Ti#0AFtV#xq1?kiChIoAv1DXp6 zk>@mjo&It6oSs^|Q4gs-UduUPnB#j>QAq*HAM2i<1BOYlioo)&pd(QL7Iy1#Vd|kj z78Bw18CcE^ok2&y;u7Mduf+zPm*n7m2CxSqx}F#%FW20|9R%c9CxD$Qr`Lh!{JQyq z%^9+;1B+Mj*Gn@n5!To+2mE@`!AgO{;UNLOp)FHr+JJ@ldxrksr~S0R%hA;f0t{`6 zV|{ES-@D+)*{39hIUF7hM@cnJzo*HUDtI^hl=gUb_I7ln=ZP1Op8focAbh81^EsP~ zvrIRJS4VUm(yL__wj%#)=;6x|U9-ZYYwPSSl^ETwQJ4m Sq8DNS0000VYSO5S3^$_E?0003- zNkl;%#MxO%M zD&+_)+ypzV+Wu}z7ABM@W$F9+;-o4eUAp}9P?zI%kKQU9c8rW7>7vv#Ywly2^b0F8 zrJ!j)mLlkj6qM)69@n^CPyIh09?Nn0zIYI0}JKDuK*yuZvn7u179s*+yYpMKy=XGVL<(U ztjkyQszblmlOMnPgh!xg8HbG>N-obK+fIhr~PZY^~wQs lMnZ^8-t#ojpS*4<7&k002ovPDHLkV1mI1xa9x< literal 0 HcmV?d00001 diff --git a/graphics/pokemon/voltorb/hisuian/front.png b/graphics/pokemon/voltorb/hisuian/front.png new file mode 100644 index 0000000000000000000000000000000000000000..12052e98d6a19efcb1b3ff6d20b6b472494a2da3 GIT binary patch literal 436 zcmV;l0ZaagP)VQqU0003$ zNklD+tu<9VY-{a+JGpN9My16a@jp94xb39_MJ2v?N=?pink zKJq)@hzJfx5Rp5AY!63~>?3Ccf%QI-d1@kTKma0a}> z0DdZ9y$cHih*iG{7BNV}vh;Nc3qUyDLs*`!g>G`AYyi)~m%1+XL9F_K#~6PvXj3rLAJdyZi)9Ra3vjUmVP#zOTRTAFzsGRtl(Gz= zuUp%1UE4YUZ>nw7O{pK7?@iEbJ1lU%IbQ7)i3annEt-fk?rvNiXwk+H17C~2V*Y^t e`16h$^+3O{{CVD~dgQ|Z0000e)_-vd-FU)h+dSM?@n2g zZ!OB0COQS@UlSH-F=hyekG%C!yhX^#Af7X3kxs_B=S{u_?3mh&O-Kg?JkL4;tX51( zYwmbfVSr-^YDe&SVgT=3K#ZCv-pG|10?awip(|`%T)0wZBafk7?8vd#3%-)D&H?C` zYx02~mD}RHka8JJq2hk#mYlnXz%xEBXxqK`SfYvje z0XhjpJnv;=u=6xWk7EYOaphA0(C_Mr0KDqrGX%y-+=poJ6zFB#6sd{aj-=d(ncSP0 zac!Z=A#WqO5+d0HZP@@i&d0gk%VnPIbF?$QD*^#&_kb3&cTa&`5ePsIDf2xrI|PQk zcL>NtT2BDEdd$FweUl@JcYr(q-Z?#!V;T`_58y@^0qXQ}iV}AbPOJtp03H>F&gn!q zO|ERq03`&+yEY6R^|Aq4<{#HFU48_X=~XScez0z74}~lYkeR(oKdJ&<7mvM$Ns@aa z537%9f$ee&19Ubfx(qJMO*R%`eScNpo@LF%6q~mg4{%FYrAWko_g6Lcwi&t(Y%LH= zQ{=cz(mxHr3nS59m1dbD#&_v`1Gr`?XUnF((o``?KYjXK>qmvoF_W_c;)mzk&*>qs zoHbo8@bRdhrfK~af4dm~Z8X>rE=rBqbEOsy;2Jf`n&)H&=gT{DK<*UzT}D;dp~1?3@jvO1$|}f5%6BGQ?honz;4MVr+0$Re!nl z2_Icd`Z$nn0YrYvn5P9;e73EAyR2KK7&k#2tZQoWx84l}!5lQs~G z+tWvZNGxih)O(wGcw%mGKf=Yfq9#6wX&}@lRST+b020QQ?IzwOVG0rzNN7N< zF+LDeyj9|8KB1%w5&|U#aLl*UHN^jk@dS^nd+Xgh>$i zmQkezjr7QGd4NtHE5(++DROgl*I1T$P5~JgrhMkbsog6R2jM?w*!i} z^YT>!C}+D{f&H9}A50$9;!YdYvk1uN4)CNlNhpAVZFi4ySaq>a^iI8An@kdbRPf$~vi z$hZmMT?HS=^ZZb}=v)ICFGvC%{1{_$cP$ifctX8Rq6%$6aK736&~7c41}ck&IJVD`{e+K2n8TfJtzMok7pNk{x@F5@I!po?*WLRhP_UQp z6!1YXTet074uy>%Gkc1*0`}l^*;*PE8Mo!@^}IKQjb|ozw{B}Tg$#bXKr(LkIG^-3 zP@J3NU5U0V8J;bT9<$jcpS-4?DS?=mg@FX@-wboi05dtKeK9;YqeinK0FKX)=>R57 z{`?iZx_{+F`*l#rhCqc+Ga}&pwFBPV7dx{JUA^5pG%8N!jo5hHThsm~2DFWenswB7 zE{0+)gampYyvqoHh=wz(_Rvt&h4@1RzU9t$O{iZ!kYS?Qu1W##{j6clEz74M)+hiM z!&LsXOK)>(uzPK8O@#PU9(hA74mdC^n2=cee%RP(4x3 z8Q)Vyhz*bLmrLO{IOfzQP=6=$pO(}4At5W8J{ zk$!ieZ_V5&FZA3X4N$A+M{CyHx8@)<7>t(S+?vB3z7vVb(a-+cQgYjy{{Ytipm~;V Rf>i(j002ovPDHLkV1gi&1783D literal 0 HcmV?d00001 diff --git a/graphics/pokemon/zoroark/hisuian/normal.pal b/graphics/pokemon/zoroark/hisuian/normal.pal new file mode 100644 index 0000000000..16e1aed003 --- /dev/null +++ b/graphics/pokemon/zoroark/hisuian/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +144 24 32 +96 88 96 +216 88 80 +248 248 248 +224 144 144 +16 16 16 +192 56 80 +144 136 144 +192 176 184 +56 56 56 +208 208 208 +88 64 88 +176 112 112 +184 192 184 +240 232 32 diff --git a/graphics/pokemon/zoroark/hisuian/shiny.pal b/graphics/pokemon/zoroark/hisuian/shiny.pal new file mode 100644 index 0000000000..5b3e2797a5 --- /dev/null +++ b/graphics/pokemon/zoroark/hisuian/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +96 48 120 +96 88 96 +176 112 208 +248 248 248 +208 144 224 +16 16 16 +144 80 168 +144 136 144 +192 176 184 +56 48 56 +208 208 208 +88 64 88 +176 104 184 +136 128 136 +240 232 32 diff --git a/graphics/pokemon/zorua/hisuian/back.png b/graphics/pokemon/zorua/hisuian/back.png new file mode 100644 index 0000000000000000000000000000000000000000..1268b09e0b0bf927b6ce2d4fd7e29c6cda8e744e GIT binary patch literal 772 zcmV+f1N;1mP)qhU|3-I`1lYI5WujwI50SffQVQ?SZH8qFnFl=s2JFI0Fa1~S593G0007y zNkl2bG`uIhWGyXPinUw;2n}E@6XTs`0ly0tp8nhrv<=m0&WX{oHmJwv=ISm zv582F4Z96+T1Ma&lmFg-+MrG8(*{Egc%JvJv5zRFZ>(pY@B5eDW59)X?yG7d02s`C zpD_lXe$$kYGF4+qTsBFBsvpyr>=6kRcfZ2hG zPM&6)b|x|H^}vZgIsh!4W<=M_0F0FY>d2&FELQ@66&=d{v=kVt=>)P6o&vyEr{50% zq~}Kt!C}THG3PwJJD6Z%B#Df#7ZMPnx?6!E#)KU6%`E_%jPrSAg$;om;_~zsnj6kn zuPYLW=)(XKN2$05iG=?gR#!UEX_XQp`=WuPc^!ana-6Nzj30lR0A-U4Ao%vvW>NDX zf4E%La{HP8nwNlEkgj|jMkLiY4P3L^U+>inX)@vbCSOdH_cibvW5Kt})_X;3{(qSsT6{&L!0B6qI-%Fqi#1i@@ROVju)QNjVh$AH^ z?NF~c5y2(9h7}=aD~GD zg$8032l1lXS1QIN(*WOD4=bE00Tv5Q%pU?sUI`<{uDN&&&;_SLhAycA)fa|%<`H+p^2K%=$cVt73xvm9#~t$W@wC>>6oC=*}ox-JO{?=*P@o0#%=;I znZm$M&CE1z0K?uklFPa5qTQYA?3nmCtg2>VlI6>*-MYQZ(owt4ie0p9%3!Y59o2s$Y`h&o;13W*Gd-2jhAf5nx{&f(7n0Rt6 zP8#S7bZ6tyOK^QT_B7zvUY#ceQtrZgFXKQ+?GWXdT;u?Ht-~4*T?k{&MtK0P zgY#a%gn!wNa{)qzUhm|oh%fa*Aa+V1;+`Jo6}bSSo*oqdgRgkCF4h2%gMY%JpP}xM g!o!PD{7LiU9|`#fY_4U Date: Fri, 19 Aug 2022 17:47:34 +0700 Subject: [PATCH 3/9] Add PLA pokemon to Form Species Table, add Kleavor's graphics --- graphics/pokemon/kleavor/back.png | Bin 0 -> 763 bytes graphics/pokemon/kleavor/front.png | Bin 0 -> 967 bytes graphics/pokemon/kleavor/normal.pal | 19 +++ graphics/pokemon/kleavor/shiny.pal | 19 +++ include/graphics.h | 8 +- src/data/graphics/pokemon.h | 8 +- .../pokemon/form_species_table_pointers.h | 46 ++++++- src/data/pokemon/form_species_tables.h | 115 ++++++++++++++++++ .../pokemon_graphics/back_pic_coordinates.h | 4 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- .../pokemon_graphics/front_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- .../pokemon_graphics/shiny_palette_table.h | 2 +- 14 files changed, 211 insertions(+), 18 deletions(-) create mode 100644 graphics/pokemon/kleavor/back.png create mode 100644 graphics/pokemon/kleavor/front.png create mode 100644 graphics/pokemon/kleavor/normal.pal create mode 100644 graphics/pokemon/kleavor/shiny.pal diff --git a/graphics/pokemon/kleavor/back.png b/graphics/pokemon/kleavor/back.png new file mode 100644 index 0000000000000000000000000000000000000000..4300b2afbc5e2b46fe85cb774f694c6b484397ef GIT binary patch literal 763 zcmV+P%x0FX!!W}$jGQ@fH>H=Xt;nlh)@^+0000000000%Jhq^0007p zNkll&H6bEp_iJgZ}sj|gKBj{#hI-q2T;kvh_j^wdaSjy@Q*SQNGTM(9R z?#h~lW9Zt#hw3|Q;)6(Lta@Uwbw9uNfA(Qn|KTFdb09be_+2&V4_}`HthxkNs4meT zR`(#BvT6V=RvE$rdJX`q?9p>zSPAOMnGp4_&KV$_>N)Eo0qRr&;lSw^uV0-2_Y@>o zCP-ca@vXS3HS05xgc`tc-=YL@njInDgh<)fU!OTZU6%I0nED?Py^cpehK8f&jW@bfR|^NEDRuj;0SHt7qlF+MoqBb zJZMXL@u_L-p8y`n&++uR0PdSW0=CDuS^|Oq2IW2m1c{&Sy)i@%!Z6?G!KIYhLkR}H z?y=k|^%Us@Is+~PcpBioQk%%rCHSRWMkOE!;H^^I%~ov|`Ua$o%8+?VTWys7{a)mW zA|vD&U<7c3yK1YRzWCtl2-(yCBaAt^-R;zN{nI7B2FpQNV(h!vWki(PtyeB~q&RO# zo=Y_3(zQGa2v)wkk3_>Tum16bghq3(@Zukzyqwg)4NWDmt_kovKab-VlXs{lUe tk6n}?kp`Aa)OuF{pFp4=G6wml>o1mM9tC-#FYy2X002ovPDHLkV1inUShD~C literal 0 HcmV?d00001 diff --git a/graphics/pokemon/kleavor/front.png b/graphics/pokemon/kleavor/front.png new file mode 100644 index 0000000000000000000000000000000000000000..cd2341c2a7cf9b67c5d73afa1a72c844f790c38c GIT binary patch literal 967 zcmV;&133JNP)SU^C4P$=NQfcW_M$jGR`h*0q0xX8GWppa+)0000000000^psV|000A0 zNklF4+A^53Y@m0OpV`h*R2y({LnSet-MgBF&@4tO0vdxm;66g< zz>xp~UJkbz*@_N@I}|8xh?5U>k5Vk#k&p~UIS7>AkMIAZ2&oq%k1WUgQNSHOEVp>{ zunLQdpA8U4^rnPiHtbfA5i3+F0}SO|E8ukAoG1nm6Z>O3(90x?fP2I~?~qOl5URNV z9-@Wwfi-9g;`KZN(VflyJ_ptgI3QT8RPMk4THJ63z&}nxrIZ69_nU+T{LjB8;;B+D z2ghv!c62f;wD_f9Afh%vUMiJci0~iaob{S%w`8Hz9R2LS5YSg|8-RmA>Hxs-%w>I* zb{iU=sWiC&5s&8)hLXk&ADB$?-`(NM0)q&%rUpV!W&r%xFUsMfU*ydwd>7>~Ddr%; zqPS%D>qS|Y!@wD>TVP-mgczEg6-kbXN|qy)nkqVrjzH`faNr~zRX z0#vD+&)TfjSDB?1z+=1>wt&p;fSa|}Y2_t`Sp#Ezy8fD&V*IwwjSZ(VQ3DgbTwhNR zSkPO&2ORH!&Gf}?-SDwZ9v`DV7&z5-Ci(Q4Pl zC9qxSW?ZV+?0}=I{h2xzoxsR8-|KIu`v9S(nAl5Qt2n)$lE$*t4v?w^kSco&INK@1 z#%x-61n7S_0Mx5{a`rqb>T#y(b;b|n7KEUK8pwDChj$PiI(&DrQO$L9@0Z{m`+ILA p2)p-x#Ps0h_!W8hCrP(K{12(p3smPTd3^u?002ovPDHLkV1f=Ry@mh) literal 0 HcmV?d00001 diff --git a/graphics/pokemon/kleavor/normal.pal b/graphics/pokemon/kleavor/normal.pal new file mode 100644 index 0000000000..fd47f8a2d2 --- /dev/null +++ b/graphics/pokemon/kleavor/normal.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +48 32 32 +144 112 112 +16 16 16 +88 64 64 +128 80 40 +224 192 128 +248 248 248 +200 200 168 +192 136 80 +240 224 184 +200 184 144 +160 144 104 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon/kleavor/shiny.pal b/graphics/pokemon/kleavor/shiny.pal new file mode 100644 index 0000000000..5634b4c703 --- /dev/null +++ b/graphics/pokemon/kleavor/shiny.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +152 208 160 +32 32 32 +104 104 104 +16 16 16 +56 56 56 +72 80 48 +144 168 104 +248 248 248 +200 200 168 +104 128 56 +216 184 104 +184 128 56 +136 80 24 +0 0 0 +0 0 0 +0 0 0 diff --git a/include/graphics.h b/include/graphics.h index a296d309c1..1c06c53a5e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -950,7 +950,7 @@ extern const u32 gMonFrontPic_Glastrier[]; extern const u32 gMonFrontPic_Spectrier[]; extern const u32 gMonFrontPic_Calyrex[]; //extern const u32 gMonFrontPic_Wyrdeer[]; -//extern const u32 gMonFrontPic_Kleavor[]; +extern const u32 gMonFrontPic_Kleavor[]; extern const u32 gMonFrontPic_Ursaluna[]; //extern const u32 gMonFrontPic_Basculegion[]; //extern const u32 gMonFrontPic_BasculegionF[]; @@ -2130,7 +2130,7 @@ extern const u32 gMonBackPic_Glastrier[]; extern const u32 gMonBackPic_Spectrier[]; extern const u32 gMonBackPic_Calyrex[]; //extern const u32 gMonBackPic_Wyrdeer[]; -//extern const u32 gMonBackPic_Kleavor[]; +extern const u32 gMonBackPic_Kleavor[]; extern const u32 gMonBackPic_Ursaluna[]; //extern const u32 gMonBackPic_Basculegion[]; //extern const u32 gMonBackPic_BasculegionF[]; @@ -3302,7 +3302,7 @@ extern const u32 gMonPalette_Glastrier[]; extern const u32 gMonPalette_Spectrier[]; extern const u32 gMonPalette_Calyrex[]; //extern const u32 gMonPalette_Wyrdeer[]; -//extern const u32 gMonPalette_Kleavor[]; +extern const u32 gMonPalette_Kleavor[]; extern const u32 gMonPalette_Ursaluna[]; //extern const u32 gMonPalette_Basculegion[]; //extern const u32 gMonPalette_BasculegionF[]; @@ -4502,7 +4502,7 @@ extern const u32 gMonShinyPalette_Glastrier[]; extern const u32 gMonShinyPalette_Spectrier[]; extern const u32 gMonShinyPalette_Calyrex[]; //extern const u32 gMonShinyPalette_Wyrdeer[]; -//extern const u32 gMonShinyPalette_Kleavor[]; +extern const u32 gMonShinyPalette_Kleavor[]; extern const u32 gMonShinyPalette_Ursaluna[]; //extern const u32 gMonShinyPalette_Basculegion[]; //extern const u32 gMonShinyPalette_BasculegionF[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index f9c634139e..1c41b1331f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -913,7 +913,7 @@ const u32 gMonFrontPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/fron const u32 gMonFrontPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/front.4bpp.lz"); const u32 gMonFrontPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/front.4bpp.lz"); //const u32 gMonFrontPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/front.4bpp.lz"); -//const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); +const u32 gMonFrontPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/front.4bpp.lz"); const u32 gMonFrontPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/front.4bpp.lz"); //const u32 gMonFrontPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/front.4bpp.lz"); //const u32 gMonFrontPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/frontf.4bpp.lz"); @@ -2093,7 +2093,7 @@ const u32 gMonBackPic_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/back. const u32 gMonBackPic_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/back.4bpp.lz"); const u32 gMonBackPic_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/back.4bpp.lz"); //const u32 gMonBackPic_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/back.4bpp.lz"); -//const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); +const u32 gMonBackPic_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/back.4bpp.lz"); const u32 gMonBackPic_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/back.4bpp.lz"); //const u32 gMonBackPic_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/back.4bpp.lz"); //const u32 gMonBackPic_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/backf.4bpp.lz"); @@ -3265,7 +3265,7 @@ const u32 gMonPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/norma const u32 gMonPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/normal.gbapal.lz"); const u32 gMonPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/normal.gbapal.lz"); //const u32 gMonPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/normal.gbapal.lz"); -//const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz"); +const u32 gMonPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/normal.gbapal.lz"); const u32 gMonPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/normal.gbapal.lz"); //const u32 gMonPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/normal.gbapal.lz"); //const u32 gMonPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/normalf.gbapal.lz"); @@ -4464,7 +4464,7 @@ const u32 gMonShinyPalette_Glastrier[] = INCBIN_U32("graphics/pokemon/glastrier/ const u32 gMonShinyPalette_Spectrier[] = INCBIN_U32("graphics/pokemon/spectrier/shiny.gbapal.lz"); const u32 gMonShinyPalette_Calyrex[] = INCBIN_U32("graphics/pokemon/calyrex/shiny.gbapal.lz"); //const u32 gMonShinyPalette_Wyrdeer[] = INCBIN_U32("graphics/pokemon/wyrdeer/shiny.gbapal.lz"); -//const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Kleavor[] = INCBIN_U32("graphics/pokemon/kleavor/shiny.gbapal.lz"); const u32 gMonShinyPalette_Ursaluna[] = INCBIN_U32("graphics/pokemon/ursaluna/shiny.gbapal.lz"); //const u32 gMonShinyPalette_Basculegion[] = INCBIN_U32("graphics/pokemon/basculegion/shiny.gbapal.lz"); //const u32 gMonShinyPalette_BasculegionF[] = INCBIN_U32("graphics/pokemon/basculegion/shinyf.gbapal.lz"); diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 7c7c56b0e3..0895fe59ea 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -18,6 +18,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MEOWTH] = sMeowthFormSpeciesIdTable, [SPECIES_PERSIAN] = sPersianFormSpeciesIdTable, [SPECIES_ALAKAZAM] = sAlakazamFormSpeciesIdTable, + [SPECIES_GROWLITHE] = sGrowlitheFormSpeciesIdTable, + [SPECIES_ARCANINE] = sArcanineFormSpeciesIdTable, [SPECIES_GEODUDE] = sGeodudeFormSpeciesIdTable, [SPECIES_GRAVELER] = sGravelerFormSpeciesIdTable, [SPECIES_GOLEM] = sGolemFormSpeciesIdTable, @@ -29,7 +31,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GRIMER] = sGrimerFormSpeciesIdTable, [SPECIES_MUK] = sMukFormSpeciesIdTable, [SPECIES_GENGAR] = sGengarFormSpeciesIdTable, - [SPECIES_EXEGGUTOR] = sExeggutorFormSpeciesIdTable, + [SPECIES_VOLTORB] = sExeggutorFormSpeciesIdTable, + [SPECIES_ELECTRODE] = sVoltorbFormSpeciesIdTable, + [SPECIES_EXEGGUTOR] = sElectrodeFormSpeciesIdTable, [SPECIES_MAROWAK] = sMarowakFormSpeciesIdTable, [SPECIES_WEEZING] = sWeezingFormSpeciesIdTable, [SPECIES_KANGASKHAN] = sKangaskhanFormSpeciesIdTable, @@ -41,9 +45,12 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ZAPDOS] = sZapdosFormSpeciesIdTable, [SPECIES_MOLTRES] = sMoltresFormSpeciesIdTable, [SPECIES_MEWTWO] = sMewtwoFormSpeciesIdTable, + [SPECIES_TYPHLOSION] = sTyphlosionFormSpeciesIdTable, [SPECIES_PICHU] = sPichuFormSpeciesIdTable, [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, + [SPECIES_QWILFISH] = sQwilfishFormSpeciesIdTable, + [SPECIES_SNEASEL] = sSneaselFormSpeciesIdTable, [SPECIES_UNOWN] = sUnownFormSpeciesIdTable, [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, @@ -88,17 +95,24 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ABOMASNOW] = sAbomasnowFormSpeciesIdTable, [SPECIES_GALLADE] = sGalladeFormSpeciesIdTable, [SPECIES_ROTOM] = sRotomFormSpeciesIdTable, + [SPECIES_DIALGA] = sDialgaFormSpeciesIdTable, + [SPECIES_PALKIA] = sPalkiaFormSpeciesIdTable, [SPECIES_GIRATINA] = sGiratinaFormSpeciesIdTable, + [SPECIES_SAMUROTT] = sSamurottFormSpeciesIdTable, [SPECIES_SHAYMIN] = sShayminFormSpeciesIdTable, [SPECIES_ARCEUS] = sArceusFormSpeciesIdTable, [SPECIES_AUDINO] = sAudinoFormSpeciesIdTable, [SPECIES_BASCULIN] = sBasculinFormSpeciesIdTable, + [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, [SPECIES_DARUMAKA] = sDarumakaFormSpeciesIdTable, [SPECIES_DARMANITAN] = sDarmanitanFormSpeciesIdTable, - [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, + [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, + [SPECIES_ZORUA] = sZoruaFormSpeciesIdTable, + [SPECIES_ZOROARK] = sZoroarkFormSpeciesIdTable, [SPECIES_DEERLING] = sDeerlingFormSpeciesIdTable, [SPECIES_SAWSBUCK] = sSawsbuckFormSpeciesIdTable, [SPECIES_STUNFISK] = sStunfiskFormSpeciesIdTable, + [SPECIES_BRAVIARY] = sBraviaryFormSpeciesIdTable, [SPECIES_TORNADUS] = sTornadusFormSpeciesIdTable, [SPECIES_THUNDURUS] = sThundurusFormSpeciesIdTable, [SPECIES_LANDORUS] = sLandorusFormSpeciesIdTable, @@ -114,12 +128,16 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_FURFROU] = sFurfrouFormSpeciesIdTable, [SPECIES_MEOWSTIC] = sMeowsticFormSpeciesIdTable, [SPECIES_AEGISLASH] = sAegislashFormSpeciesIdTable, + [SPECIES_SLIGGOO] = sSliggooFormSpeciesIdTable, + [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable, [SPECIES_PUMPKABOO] = sPumpkabooFormSpeciesIdTable, [SPECIES_GOURGEIST] = sGourgeistFormSpeciesIdTable, + [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, [SPECIES_XERNEAS] = sXerneasFormSpeciesIdTable, [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, [SPECIES_HOOPA] = sHoopaFormSpeciesIdTable, + [SPECIES_DECIDUEYE] = sDecidueyeFormSpeciesIdTable, [SPECIES_ORICORIO] = sOricorioFormSpeciesIdTable, [SPECIES_ROCKRUFF] = sRockruffFormSpeciesIdTable, [SPECIES_LYCANROC] = sLycanrocFormSpeciesIdTable, @@ -143,6 +161,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_URSHIFU] = sUrshifuFormSpeciesIdTable, [SPECIES_ZARUDE] = sZarudeFormSpeciesIdTable, [SPECIES_CALYREX] = sCalyrexFormSpeciesIdTable, + [SPECIES_ENAMORUS] = sEnamorusFormSpeciesIdTable, // Megas [SPECIES_VENUSAUR_MEGA] = sVenusaurFormSpeciesIdTable, [SPECIES_CHARIZARD_MEGA_X] = sCharizardFormSpeciesIdTable, @@ -234,6 +253,23 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DARMANITAN_GALARIAN] = sDarmanitanFormSpeciesIdTable, [SPECIES_YAMASK_GALARIAN] = sYamaskFormSpeciesIdTable, [SPECIES_STUNFISK_GALARIAN] = sStunfiskFormSpeciesIdTable, + //Hisuian Forms + [SPECIES_GROWLITHE_HISUIAN] = sGrowlitheFormSpeciesIdTable, + [SPECIES_ARCANINE_HISUIAN] = sArcanineFormSpeciesIdTable, + [SPECIES_VOLTORB_HISUIAN] = sVoltorbFormSpeciesIdTable, + [SPECIES_ELECTRODE_HISUIAN] = sElectrodeFormSpeciesIdTable, + [SPECIES_TYPHLOSION_HISUIAN] = sTyphlosionFormSpeciesIdTable, + [SPECIES_QWILFISH_HISUIAN] = sQwilfishFormSpeciesIdTable, + [SPECIES_SNEASEL_HISUIAN] = sSneaselFormSpeciesIdTable, + [SPECIES_SAMUROTT_HISUIAN] = sSamurottFormSpeciesIdTable, + [SPECIES_LILLIGANT_HISUIAN] = sLilligantFormSpeciesIdTable, + [SPECIES_ZORUA_HISUIAN] = sZoruaFormSpeciesIdTable, + [SPECIES_ZOROARK_HISUIAN] = sZoroarkFormSpeciesIdTable, + [SPECIES_BRAVIARY_HISUIAN] = sBraviaryFormSpeciesIdTable, + [SPECIES_SLIGGOO_HISUIAN] = sSliggooFormSpeciesIdTable, + [SPECIES_GOODRA_HISUIAN] = sGoodraFormSpeciesIdTable, + [SPECIES_AVALUGG_HISUIAN] = sAvaluggFormSpeciesIdTable, + [SPECIES_DECIDUEYE_HISUIAN] = sDecidueyeFormSpeciesIdTable, // Misc Forms // Cosplay Pikachu [SPECIES_PIKACHU_COSPLAY] = sPikachuFormSpeciesIdTable, @@ -307,7 +343,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ROTOM_FROST] = sRotomFormSpeciesIdTable, [SPECIES_ROTOM_FAN] = sRotomFormSpeciesIdTable, [SPECIES_ROTOM_MOW] = sRotomFormSpeciesIdTable, - // Giratina + // Origin Forme + [SPECIES_DIALGA_ORIGIN] = sDialgaFormSpeciesIdTable, + [SPECIES_PALKIA_ORIGIN] = sPalkiaFormSpeciesIdTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormSpeciesIdTable, // Shaymin [SPECIES_SHAYMIN_SKY] = sShayminFormSpeciesIdTable, @@ -331,6 +369,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_ARCEUS_FAIRY] = sArceusFormSpeciesIdTable, // Basculin [SPECIES_BASCULIN_BLUE_STRIPED] = sBasculinFormSpeciesIdTable, + [SPECIES_BASCULIN_WHITE_STRIPED] = sBasculinFormSpeciesIdTable, // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = sDarmanitanFormSpeciesIdTable, [SPECIES_DARMANITAN_ZEN_MODE_GALARIAN] = sDarmanitanFormSpeciesIdTable, @@ -346,6 +385,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable, [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable, + [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable, [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 810da64997..c6660f6e7a 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -121,6 +121,18 @@ static const u16 sAlakazamFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sGrowlitheFormSpeciesIdTable[] = { + SPECIES_GROWLITHE, + SPECIES_GROWLITHE_HISUIAN, + FORM_SPECIES_END, +}; + +static const u16 sArcanineFormSpeciesIdTable[] = { + SPECIES_ARCANINE, + SPECIES_ARCANINE_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sGeodudeFormSpeciesIdTable[] = { SPECIES_GEODUDE, SPECIES_GEODUDE_ALOLAN, @@ -188,6 +200,18 @@ static const u16 sGengarFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sVoltorbFormSpeciesIdTable[] = { + SPECIES_VOLTORB, + SPECIES_VOLTORB_HISUIAN, + FORM_SPECIES_END, +}; + +static const u16 sElectrodeFormSpeciesIdTable[] = { + SPECIES_ELECTRODE, + SPECIES_ELECTRODE_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sExeggutorFormSpeciesIdTable[] = { SPECIES_EXEGGUTOR, SPECIES_EXEGGUTOR_ALOLAN, @@ -254,6 +278,12 @@ static const u16 sMoltresFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sTyphlosionFormSpeciesIdTable[] = { + SPECIES_TYPHLOSION, + SPECIES_TYPHLOSION_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sMewtwoFormSpeciesIdTable[] = { SPECIES_MEWTWO, SPECIES_MEWTWO_MEGA_X, @@ -279,6 +309,18 @@ static const u16 sSlowkingFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sQwilfishFormSpeciesIdTable[] = { + SPECIES_QWILFISH, + SPECIES_QWILFISH_HISUIAN, + FORM_SPECIES_END, +}; + +static const u16 sSneaselFormSpeciesIdTable[] = { + SPECIES_SNEASEL, + SPECIES_SNEASEL_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sUnownFormSpeciesIdTable[] = { SPECIES_UNOWN, SPECIES_UNOWN_B, @@ -579,12 +621,30 @@ static const u16 sRotomFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sDialgaFormSpeciesIdTable[] = { + SPECIES_DIALGA, + SPECIES_DIALGA_ORIGIN, + FORM_SPECIES_END, +}; + +static const u16 sPalkiaFormSpeciesIdTable[] = { + SPECIES_PALKIA, + SPECIES_PALKIA_ORIGIN, + FORM_SPECIES_END, +}; + static const u16 sGiratinaFormSpeciesIdTable[] = { SPECIES_GIRATINA, SPECIES_GIRATINA_ORIGIN, FORM_SPECIES_END, }; +static const u16 sSamurottFormSpeciesIdTable[] = { + SPECIES_SAMUROTT, + SPECIES_SAMUROTT_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sShayminFormSpeciesIdTable[] = { SPECIES_SHAYMIN, SPECIES_SHAYMIN_SKY, @@ -622,6 +682,13 @@ static const u16 sAudinoFormSpeciesIdTable[] = { static const u16 sBasculinFormSpeciesIdTable[] = { SPECIES_BASCULIN, SPECIES_BASCULIN_BLUE_STRIPED, + SPECIES_BASCULIN_WHITE_STRIPED, + FORM_SPECIES_END, +}; + +static const u16 sLilligantFormSpeciesIdTable[] = { + SPECIES_LILLIGANT, + SPECIES_LILLIGANT_HISUIAN, FORM_SPECIES_END, }; @@ -645,6 +712,18 @@ static const u16 sYamaskFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sZoruaFormSpeciesIdTable[] = { + SPECIES_ZORUA, + SPECIES_ZORUA_HISUIAN, + FORM_SPECIES_END, +}; + +static const u16 sZoroarkFormSpeciesIdTable[] = { + SPECIES_ZOROARK, + SPECIES_ZOROARK_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sDeerlingFormSpeciesIdTable[] = { SPECIES_DEERLING, SPECIES_DEERLING_SUMMER, @@ -667,6 +746,12 @@ static const u16 sStunfiskFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sBraviaryFormSpeciesIdTable[] = { + SPECIES_BRAVIARY, + SPECIES_BRAVIARY_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sTornadusFormSpeciesIdTable[] = { SPECIES_TORNADUS, SPECIES_TORNADUS_THERIAN, @@ -685,6 +770,12 @@ static const u16 sLandorusFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sEnamorusFormSpeciesIdTable[] = { + SPECIES_ENAMORUS, + SPECIES_ENAMORUS_THERIAN, + FORM_SPECIES_END, +}; + static const u16 sKyuremFormSpeciesIdTable[] = { SPECIES_KYUREM, SPECIES_KYUREM_WHITE, @@ -798,6 +889,18 @@ static const u16 sAegislashFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sSliggooFormSpeciesIdTable[] = { + SPECIES_SLIGGOO, + SPECIES_SLIGGOO_HISUIAN, + FORM_SPECIES_END, +}; + +static const u16 sGoodraFormSpeciesIdTable[] = { + SPECIES_GOODRA, + SPECIES_GOODRA_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sPumpkabooFormSpeciesIdTable[] = { SPECIES_PUMPKABOO, SPECIES_PUMPKABOO_SMALL, @@ -814,6 +917,12 @@ static const u16 sGourgeistFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sAvaluggFormSpeciesIdTable[] = { + SPECIES_AVALUGG, + SPECIES_AVALUGG_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sXerneasFormSpeciesIdTable[] = { SPECIES_XERNEAS, SPECIES_XERNEAS_ACTIVE, @@ -841,6 +950,12 @@ static const u16 sHoopaFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +static const u16 sDecidueyeFormSpeciesIdTable[] = { + SPECIES_DECIDUEYE, + SPECIES_DECIDUEYE_HISUIAN, + FORM_SPECIES_END, +}; + static const u16 sOricorioFormSpeciesIdTable[] = { SPECIES_ORICORIO, SPECIES_ORICORIO_POM_POM, diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index fe8834eeef..9a1a662b14 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4506,8 +4506,8 @@ const struct MonCoords gMonBackPicCoords[] = }, [SPECIES_KLEAVOR] = { - .size = MON_COORDS_SIZE(64, 64), - .y_offset = 0, + .size = MON_COORDS_SIZE(64, 56), + .y_offset = 4, }, [SPECIES_URSALUNA] = { diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 4f4c7504cc..d2d02b5400 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -900,7 +900,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SPECTRIER, gMonBackPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonBackPic_Calyrex), SPECIES_SPRITE(WYRDEER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Wyrdeer), - SPECIES_SPRITE(KLEAVOR, gMonBackPic_CircledQuestionMark), //gMonBackPic_Kleavor), + SPECIES_SPRITE(KLEAVOR, gMonBackPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonBackPic_Ursaluna), SPECIES_SPRITE(BASCULEGION, gMonBackPic_CircledQuestionMark), //gMonBackPic_Basculegion), SPECIES_SPRITE(SNEASLER, gMonBackPic_CircledQuestionMark), //gMonBackPic_Sneasler), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index a54260b43b..d2cfdbedfd 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4507,7 +4507,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KLEAVOR] = { .size = MON_COORDS_SIZE(64, 64), - .y_offset = 0, + .y_offset = 2, }, [SPECIES_URSALUNA] = { diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 98651a249d..0ec83bb29c 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -900,7 +900,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SPECTRIER, gMonFrontPic_Spectrier), SPECIES_SPRITE(CALYREX, gMonFrontPic_Calyrex), SPECIES_SPRITE(WYRDEER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Wyrdeer), - SPECIES_SPRITE(KLEAVOR, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Kleavor), + SPECIES_SPRITE(KLEAVOR, gMonFrontPic_Kleavor), SPECIES_SPRITE(URSALUNA, gMonFrontPic_Ursaluna), SPECIES_SPRITE(BASCULEGION, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Basculegion), SPECIES_SPRITE(SNEASLER, gMonFrontPic_CircledQuestionMark), //gMonFrontPic_Sneasler), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 28289402dc..16ba152cb9 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -900,7 +900,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SPECTRIER, gMonPalette_Spectrier), SPECIES_PAL(CALYREX, gMonPalette_Calyrex), SPECIES_PAL(WYRDEER, gMonPalette_CircledQuestionMark), // gMonPalette_Wyrdeer), - SPECIES_PAL(KLEAVOR, gMonPalette_CircledQuestionMark), // gMonPalette_Kleavor), + SPECIES_PAL(KLEAVOR, gMonPalette_Kleavor), SPECIES_PAL(URSALUNA, gMonPalette_Ursaluna), SPECIES_PAL(BASCULEGION, gMonPalette_CircledQuestionMark), // gMonPalette_Basculegion), SPECIES_PAL(SNEASLER, gMonPalette_CircledQuestionMark), // gMonPalette_Sneasler), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 20728eaf77..6b4baa8c79 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -900,7 +900,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SPECTRIER, gMonShinyPalette_Spectrier), SPECIES_SHINY_PAL(CALYREX, gMonShinyPalette_Calyrex), SPECIES_SHINY_PAL(WYRDEER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Wyrdeer), - SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Kleavor), + SPECIES_SHINY_PAL(KLEAVOR, gMonShinyPalette_Kleavor), SPECIES_SHINY_PAL(URSALUNA, gMonShinyPalette_Ursaluna), SPECIES_SHINY_PAL(BASCULEGION, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Basculegion), SPECIES_SHINY_PAL(SNEASLER, gMonShinyPalette_CircledQuestionMark), // gMonShinyPalette_Sneasler), From 346f3b7f4c3bbd51038becb75498be7fe8f6e306 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Fri, 19 Aug 2022 18:01:28 +0700 Subject: [PATCH 4/9] Fix PLA's base_stats.h (rename .item2 to .itemRare) --- src/data/pokemon/base_stats.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index d8c6c608ff..2e56cab4b4 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -25333,7 +25333,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 88, .evYield_Attack = 1, - .item2 = ITEM_POISON_BARB, + .itemRare = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -25359,7 +25359,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 86, .evYield_Speed = 1, - .item2 = ITEM_QUICK_CLAW, + .itemRare = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -25411,7 +25411,7 @@ const struct BaseStats gBaseStats[] = .expYield = 168, .evYield_Attack = 2, #ifdef ITEM_EXPANSION - .item2 = ITEM_ABSORB_BULB, + .itemRare = ITEM_ABSORB_BULB, #endif .genderRatio = MON_FEMALE, .eggCycles = 20, @@ -25514,7 +25514,7 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_SpDefense = 2, #ifdef ITEM_EXPANSION - .item2 = ITEM_SHED_SHELL, + .itemRare = ITEM_SHED_SHELL, #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, @@ -25949,7 +25949,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 161, .evYield_Speed = 2, - .item2 = ITEM_DEEP_SEA_SCALE, + .itemRare = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, From 2b512a8e0361a0235fa5be6005a35a19ca385089 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Fri, 19 Aug 2022 18:14:11 +0700 Subject: [PATCH 5/9] Fix Voltorb and Exeggutor' form species table --- src/data/pokemon/form_species_table_pointers.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 0895fe59ea..f516d4e7b3 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -31,9 +31,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GRIMER] = sGrimerFormSpeciesIdTable, [SPECIES_MUK] = sMukFormSpeciesIdTable, [SPECIES_GENGAR] = sGengarFormSpeciesIdTable, - [SPECIES_VOLTORB] = sExeggutorFormSpeciesIdTable, - [SPECIES_ELECTRODE] = sVoltorbFormSpeciesIdTable, - [SPECIES_EXEGGUTOR] = sElectrodeFormSpeciesIdTable, + [SPECIES_VOLTORB] = sVoltorbFormSpeciesIdTable, + [SPECIES_ELECTRODE] = sElectrodeFormSpeciesIdTable, + [SPECIES_EXEGGUTOR] = sExeggutorFormSpeciesIdTable, [SPECIES_MAROWAK] = sMarowakFormSpeciesIdTable, [SPECIES_WEEZING] = sWeezingFormSpeciesIdTable, [SPECIES_KANGASKHAN] = sKangaskhanFormSpeciesIdTable, From fb00ac977a8e3d5229de48c70b740e9f1e471a5a Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Wed, 24 Aug 2022 16:21:45 +0700 Subject: [PATCH 6/9] Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish --- src/data/pokemon/form_species_tables.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 9467006452..8e89a3836a 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -309,7 +309,6 @@ static const u16 sSlowkingFormSpeciesIdTable[] = { SPECIES_SLOWKING_GALARIAN, FORM_SPECIES_END, }; -#endif static const u16 sQwilfishFormSpeciesIdTable[] = { SPECIES_QWILFISH, @@ -322,7 +321,7 @@ static const u16 sSneaselFormSpeciesIdTable[] = { SPECIES_SNEASEL_HISUIAN, FORM_SPECIES_END, }; - +#endif static const u16 sUnownFormSpeciesIdTable[] = { SPECIES_UNOWN, SPECIES_UNOWN_B, From d6998d4579e5587ed2b50952f29d461b812d4c70 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Sun, 28 Aug 2022 19:55:45 +0700 Subject: [PATCH 7/9] Edited PLA' pokedex_text.h --- src/data/pokemon/pokedex_text.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index fbb8545ad0..bf32932032 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -5354,12 +5354,12 @@ const u8 gWyrdeerPokedexText[] = _( "The black orbs shine with an uncanny light\n" "when it is erecting invisible barriers.\n" "The fur shed from its beard retains heat\n" - "and useful for winter clothing."); + "and is useful for winter clothing."); const u8 gKleavorPokedexText[] = _( "A violent creature that fells trees with\n" "its crude axes and shields itself with hard\n" - "stone. If one should encounter this Pokémon\n" + "stone. Should one encounter this Pokémon\n" "in the wild, one's only recourse is to flee."); const u8 gUrsalunaPokedexText[] = _( @@ -5368,9 +5368,10 @@ const u8 gUrsalunaPokedexText[] = _( "manipulate peat at will."); const u8 gBasculegionPokedexText[] = _( - "It clads itself in the souls of comrades\n" - "that perishes before their goals of\n" - "journeying upstream."); + "Clads itself in the souls of comrades that\n" + "perished before fulfilling their goals of\n" + "journeying upstream. No other species in\n" + "all Hisui's rivers is Basculegion's equal."); const u8 gSneaslerPokedexText[] = _( "Because of its wicked poison and daunting\n" @@ -5381,8 +5382,8 @@ const u8 gSneaslerPokedexText[] = _( const u8 gOverqwilPokedexText[] = _( "Its lancelike spikes and savage\n" "temperament have earned it the\n" - "nickname Sea Fiend.\n" - "It surps up poison to nourish itself."); + "nickname “Sea Fiend”.\n" + "It slurps up poison to nourish itself."); const u8 gEnamorusPokedexText[] = _( "Its arrival brings an end to the\n" From 32a1017c2dfbf6f12f7643966e33188333eeb351 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 29 Aug 2022 10:13:01 -0400 Subject: [PATCH 8/9] Fixed tab --- src/data/text/species_names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 8e82d47a94..978730bfe4 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1093,7 +1093,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ROTOM_FROST] = _("Rotom"), [SPECIES_ROTOM_MOW] = _("Rotom"), [SPECIES_ROTOM_WASH] = _("Rotom"), - // Origin + // Origin [SPECIES_DIALGA_ORIGIN] = _("Dialga"), [SPECIES_PALKIA_ORIGIN] = _("Palkia"), [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), From b209645b2067601ad0f6142191df5500673c27e2 Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Mon, 29 Aug 2022 21:33:28 +0700 Subject: [PATCH 9/9] Changes Origin to Origin Forme --- src/data/text/species_names.h | 2 +- src/pokemon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 978730bfe4..ad0a1ba7c6 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1093,7 +1093,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ROTOM_FROST] = _("Rotom"), [SPECIES_ROTOM_MOW] = _("Rotom"), [SPECIES_ROTOM_WASH] = _("Rotom"), - // Origin + // Origin Forme [SPECIES_DIALGA_ORIGIN] = _("Dialga"), [SPECIES_PALKIA_ORIGIN] = _("Palkia"), [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), diff --git a/src/pokemon.c b/src/pokemon.c index 5bd93b33f6..350aebf0b8 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1428,7 +1428,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM, [SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM, [SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM, - // Origin + // Origin Forme [SPECIES_DIALGA_ORIGIN - 1] = NATIONAL_DEX_DIALGA, [SPECIES_PALKIA_ORIGIN - 1] = NATIONAL_DEX_PALKIA, [SPECIES_GIRATINA_ORIGIN - 1] = NATIONAL_DEX_GIRATINA,