From e4731b1289d9b5e7c8ce9511df61f79d1a81e7cc Mon Sep 17 00:00:00 2001 From: Pokestia <57683071+Pokestia@users.noreply.github.com> Date: Mon, 30 Dec 2019 13:48:50 +0100 Subject: [PATCH] Pokemon expansion (#211) * Define species Meltan and Melmetal Also shifted a few other species numbers * Define Meltan and Melmetal Sprites * Add Meltan and Melmetal coordinates and table entries * Set Meltan and Melmetal ingame names * Add Meltan and Melmetal base stats * Add Meltan and Melmetal level up learnsets * Set Meltan and Melmetal TM learnset It is still blank because LGPE TMs don't match USUM TMs * Define Meltan and Melmetal sprite paths * Add Meltan and Melmetal sprite, icon and front animation * Fix typo in bas stats * Add Meltan and Melmetal pokedex entries * Tab to space learnsets * Tab to space pokedex text This includes all mons with tabs in their dex entries. --- graphics/pokemon/melmetal/back.png | Bin 0 -> 496 bytes graphics/pokemon/melmetal/front.png | Bin 0 -> 1068 bytes graphics/pokemon/melmetal/icon.png | Bin 0 -> 538 bytes graphics/pokemon/melmetal/normal.pal | 19 ++++++++ graphics/pokemon/melmetal/shiny.pal | 19 ++++++++ graphics/pokemon/meltan/back.png | Bin 0 -> 549 bytes graphics/pokemon/meltan/front.png | Bin 0 -> 551 bytes graphics/pokemon/meltan/icon.png | Bin 0 -> 300 bytes graphics/pokemon/meltan/normal.pal | 19 ++++++++ graphics/pokemon/meltan/shiny.pal | 19 ++++++++ include/constants/species.h | 17 ++++--- include/graphics.h | 10 ++++ src/data/graphics/pokemon.h | 10 ++++ src/data/pokemon/base_stats.h | 46 ++++++++++++++++++ src/data/pokemon/level_up_learnset_pointers.h | 2 + src/data/pokemon/level_up_learnsets.h | 10 ++++ src/data/pokemon/pokedex_entries.h | 24 +++++++++ src/data/pokemon/pokedex_text.h | 40 +++++++++------ src/data/pokemon/tmhm_learnsets.h | 4 ++ .../pokemon_graphics/back_pic_coordinates.h | 10 ++++ src/data/pokemon_graphics/back_pic_table.h | 2 + src/data/pokemon_graphics/front_pic_anims.h | 24 +++++++++ .../pokemon_graphics/front_pic_coordinates.h | 10 ++++ src/data/pokemon_graphics/front_pic_table.h | 2 + src/data/pokemon_graphics/palette_table.h | 2 + .../pokemon_graphics/shiny_palette_table.h | 2 + src/data/text/species_names.h | 2 + src/pokemon.c | 4 ++ src/pokemon_icon.c | 4 ++ 29 files changed, 279 insertions(+), 22 deletions(-) create mode 100644 graphics/pokemon/melmetal/back.png create mode 100644 graphics/pokemon/melmetal/front.png create mode 100644 graphics/pokemon/melmetal/icon.png create mode 100644 graphics/pokemon/melmetal/normal.pal create mode 100644 graphics/pokemon/melmetal/shiny.pal create mode 100644 graphics/pokemon/meltan/back.png create mode 100644 graphics/pokemon/meltan/front.png create mode 100644 graphics/pokemon/meltan/icon.png create mode 100644 graphics/pokemon/meltan/normal.pal create mode 100644 graphics/pokemon/meltan/shiny.pal diff --git a/graphics/pokemon/melmetal/back.png b/graphics/pokemon/melmetal/back.png new file mode 100644 index 0000000000000000000000000000000000000000..26889e2d1dec88e6954e31827184c5218b3b675d GIT binary patch literal 496 zcmVPx#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_SWrlahD0ZBKTe2SniX%w9GB zV$1($|93X1m;SL5`YC;`><^v6atXeD5%l!GPhEJd#0{ z0qrU-qLl#$+G-cgsC)@l_cY2G2_FDGPvi^+tX?K!M#2gGk|kzP33CF^#0&=XIkc75pUvbSnTKPr x`A1M;t049Fo=M< zcVB7-GDF&*k}`nB(q>5}Vhvfb2YgxMyg)7h`v5-3AfTZS+ps~GNdsgdfca@E*=4a0 zIxJ$k(bD?q(%VAVY`Sfhfoa>k1GYCkfqxPNRsQx}0HmdsfkzuxhyhCxsat;RKz7&0 mXar!_CmmqS5%ALAkWxSIDHjln#OPrF0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_SWrlahz1__#>;;FvftFd!Hh zU|?9VU?>m}5cv4`*x1;xu%N&wD9FGpN&o-=32;bRa{vGi!vFvd!vV){sAK>D1BFRM zK~zY`<4S-PUacpQuN(Kb~{&%gYAo)r0OFTnM0^(kDk~NrPr}bWD29AaHX~Q=m#c z;c7tYT=vNN&063h>YWBq`s5D{?1q&6jqnAmh}ZERRMhaT!{GirrEFSTN@azdH|HJr9$ii@SGM1 zF+C=AdIlVd_r6aVu|dS2^_>ms7rNT@~9PGu=kKeGDeVC?uAX-+G z1?1qH7?zmwx5+CQ$Tno01mxiBX)0noSis4vcKa^57g{_I$N}9kC00NtuiNAn1W3-g zQ3NoMs|ElGtK4<0QHm3z2;h30@O_-dN6Q@Uag>^WG7Vm2dyqTWg06l}?vOn!c=wu&&t%axRMs_v2kZ{UcTzh%lG;tMbfF zC?n6xZ+DSima}0(J2}u1u#RUe=mR-I_);onqX>Xr zBaeW9XX9MJbcrPK<{*oJfWt#kD1NdD10E`8+h@V=C!3hpv%_%_yjNhk1WJ7&B3R>b zp}#OGfN=)=tr93)t#*^Z&Hp2qoCAK!ds50^PkmSgF!&Hm%^$fb)d;V8^c)bI+!&cs zO=$NF*vkT7&?+!^5}T1vd7)oP*K~loW~c^m7Wu`#QMn3Ri_K{Urg-)=D)j+$)Vm}D z0$w_(+&4y78T`Tj&`8 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/melmetal/icon.png b/graphics/pokemon/melmetal/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fa70c6b6b50788a61f19a2f3720cf7536ad3ec47 GIT binary patch literal 538 zcmV+#0_FXQP)DV$`I1j69C<5@5^-Q`qDDv`K*1r zWVmpDLFB13h`ER|*Ee}e|9&E*48C2ir|*5=zjw((Zai93fMZufl%_tA0HUT!-U)yj z6A^)g&sfK5&<42%1Bb{XN=n*$tDFpl{1eHwRjRQm;8(Cv3oyqh{bVT1R-0C8I0ht- z*ea7Flnx0Fm=7T#|kR9{K)sNAE7qIuu>c@D|8EDh2ehf=QHJFDVD^UFKLuy>Meq40e`Z4IZ^Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_*k~xQNGSNAQ25}O`1tsMFdz^R5Li%1 zI503^U|87L*ocUDu&|&2Fn9o1*zq7&3jhEB32;bRa{vGi!vFvd!vV){sAK>D0e(qD zK~zY`?US);!!QtrHQCUqXG5|kDmZf@$eVP^;y9q8lhdK0(7kzs)=y9{@z^QNTrlxm zXq|WI>10EQPnk3177Ok>eZLMYu641c6M1{4?PIuO7<$i(IFWCQ_7{5l*7UN8*I!Qnt4fB_wNM`8>E zal>HYdhQJDHju`4+QMWZ?<33JXXEoE-34=Xn}$OZmMe2 n0<58^e_vWf`6I4%aV5k*dHSVi4vEV;00000NkvXXu0mjf=$q^5 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/meltan/front.png b/graphics/pokemon/meltan/front.png new file mode 100644 index 0000000000000000000000000000000000000000..97ebff0de7e4f6aef7168e5e3b56e5159223bb1a GIT binary patch literal 551 zcmV+?0@(eDP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMVQc_;D8{oU?}*wNciBG`1tsMKp+qh5Li%1 zI503^U|87L*ocUDu&|(T5D>s9C`@>m{r~^~32;bRa{vGi!vFvd!vV){sAK>D0f0$F zK~zY`?b0!8!ax)U@Wa7?Q%@nzNx;tW#9e4Vf>3a2QgA*HdTpt6wVy!Tx)r3I1+N*4 zL*gh7$w5DXAEEZ;>iAweb*ld*!~K%~-Mg@3{%tttKdx6q=bZBs8U#X!vwqJfKhO|m zI=vy;@SQflBpcje1cCt2;6}3I3E{a!Ll`%$BS0WrPr}m^A=&|NMxIm>zJ%}6HaL?h z$ToLT(5*LbE*>Rxp@0P?m{{O(iGV8rx06{3S`h|D0G!#>9;bzYYIrzBL&QD?obs4< zw<12pHp#BsI!qD<)%9^O3M1b(xM%|axGX=0%Zgh#s0vZ{VV!E2KOcS=qM@eyDz<=V zaI(#yP}c$3z|`ADC&fysyC+77L~EUxTrVkcKhR~2UJ{^YK{7X63ZxdSl>7zk*bWD; z7U=Y0xBo!FOW%TGu~(m1OKo!ixnc@!cpn&;LXxGDIT#pcrpSyb)`mERlV_DV$FAGSbEQ=m7$Yny@B4#0tRWs z!f|86&{)}M{N4P#pP5O%5ML%B!e+j0cSmj{@15sJHspJTfQ_O!W~6C@aOi5LOaa07 z)krRi#0l^NEzO>7DNfpsuZ8)J*qr_dVS&UEC1pIZ&{eD9!U!1kD0xDVZRgn`@z?JZ y2CylNq