From d21c41fd1125cc5f4cab96d837f8f6dd49505ab7 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Tue, 11 Jun 2019 10:13:29 -0400
Subject: [PATCH] Add Proper Castform + Remove Cry Extractor

---
 .../backspr/gBackShinySprite385Castform.png   | Bin 1066 -> 2202 bytes
 graphics/backspriteflags.grit                 |   2 +-
 graphics/frontspr/gFrontSprite385Castform.png | Bin 1077 -> 2395 bytes
 graphics/frontspriteflags.grit                |   2 +-
 scripts/data_extractor.py                     |   4 +---
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/graphics/backspr/gBackShinySprite385Castform.png b/graphics/backspr/gBackShinySprite385Castform.png
index 20baea157b59ab7c5e3b5bf13257f4f802a4f02c..d5b239c2f9abafc4de8b58794b46d9b558aaf2da 100644
GIT binary patch
delta 1505
zcmV<71s?jU2$~U)7CHd{2m=5B05q6@Gynht08mU+MZmz2ds=(Fl)c`)=JxjP0002^
z?f})r0000000000000000GxZAkx)?#gS5qq&E8O8fW^hdk*y>QbEJz>b828naEr~X
zvE57pf5~TMQ~&@4RY^oaRCt{2nhTQSC=7-pQfb?SBp2!XpKn0oA#5H3Pxo%^T2nRM
zmG=Kd1|cEr+wHP{uNh;`$?y032?X59W)VSe4d(Rb@pyomCRjE84@%AY5I~M_0&sIa
zD0PbPHvlK}KzA@53@BGH8BboWl$s04C|7eKf0^`ZDyW%$j*tN&Lk`&M38B8lgaW|Y
z_m>n<)?2_LBvb)X7b<tKNC7nmmgQ@CoC7TXEC30=1gH}pA^;`AGC-uS0@Sw<P$dZO
zzyeHBZ>0K~3vzv#Frufjm>G=e_lSph{Bnc|a)5~f_ehiBGU_ma-@(jIB_G5I7Z|{(
ze~GP5(%;n`M&ke=(<@`f0K40_|6nYVd`4j_3I-z?FbW|9j7B2vR8K~78jI<D8m*_9
zWxx<~&R=%fWtUxc*?-lvvorG5*>ri<>-)VDVp{J3bA;r;900a8*)~SNp`QoP*aK{d
zusMKqO0~ap3-Ac{i|sh@_dX&H9Ri|Re|h-43y341>xDs)^cD~{nijxDv<*mC0_);|
z1KKkJe&le>!hs<EOf&N70o<4;H{9<83Nz9KAOY5$K^Tio1UTpeK=lDO)&Qsc?Zd{|
zj?mE4wWxoinvMY-RRq8w4*H-Dhmn!c(60%w=5lOY{gl>M6fHuES+9?MFCm<{f4e9n
zd;+DxOKQf@oAUzWtVGaEuX1@nq<AVV2o5;N3DE`k7%J;yCrYtZn2Z>Mx~z|_EUt;4
z09XRF^bAmoM`!~STa@K^JPXik2jB@+2l@boD`NZ9^nHNKj}^HcfwfCO2deuGa2Z=L
zk6Sgbhe$dDXcE#|sE$HA7Sm#^f2TEQ#Zm+`6MKC<=@kU}D#4|E@TH{<K!Qu0xg3iw
ze4M<a$FbZn_v)b5zNUR{pT3+SHY#mflwWq)WtaUwjW+2g^wcrTA3x~SxKAQ@+cSsA
z8mAdT*8R^NK&%Pzeoqjr3tIwA5S$0`3}S}h>uV$ok3$X^AIWh1a2CMle{zTb2lXI9
zAH-vXq>l|ensk>F&VqOYKjeb;{Xg%%2_bWV95^)aTI_-@9sm$Q;)32E0AvJ#3p(i2
zR+ka_E(8bi&Gvu`?xIoyPsbPn7Z6ZtIIR9l0KmyAw=4wc-9yy@Ywo3}t_y9z>m*<~
z4Oo5&P$xitIh+PyS*`cqe}YJCwa=mjeHzdp2s28x{}yM(TK_H1st`&-Cf5U%A#9L%
z|2<L{Ua$0Mfc4)_FX_NvujlibKc0w>8SGzr2$Vmc1_}r;#yCV%PjY8_1OR?)I)uwE
zyX>;de#Q*98SRtX2*zHxK8v<W7);IjJ<jOp>Ed$RNPlV)NRJoqe+pw_v}(L@SCr%o
z(IlAgJx*YNnPG%Fz@%sYRv+x(LgOh-YS=?D&kB4CfHTZr+@L4_`_~}+7?l9_WBkI(
z1Ol+5sq)iG{FC##B+lOms64I=O16Xm4&ugRA_E2g2_(|r!ZXvoI%jmYdHj73vok*&
zO+6w!WUn`VIJyKwe{*&eEB}H(UmvE98Qbvp2n1-fJiQ(NX#kF3we1shO}Kn&fG^#B
z+DL@6fW`rY7BoH30K6ms(>j3A?W|7vp9Czr6NoPA8*#8`4DzZISdm?3Z2++Ms}x9I
z&>Qopw9U;_?n?lmvf79wP08JTOGQuXwE>`{S9ZYyeA218dqA&wV1g(DD5r+zzocLN
zD{sX&KkXDyX|MUfUN~|$u}9z(_|1XS8?!%vaCtf9{lh?-r1v`lhe!ty`}(qP<4xRF
z`J3D#!>hx7qvC>z`cT3Afk8^_;lnfxp8|mEIRV(mkOBSxbN6-YU@@`q00000NkvXX
Hu0mjf0E)If

delta 361
zcmbOwxQb(fm=%Kq2Qvc$!`$tSZx|Su83KGlTn`+WkPs1ZV!@6F2X6eh@dGIP<AcM4
z4GKU8988!nVPZfaPsfQH4I2&wBs3g2aA4wE6(D~_!GewikAfW!9&Ehp!&D#X+-(lj
z^wiVEF{EP7+p8D(niY6h1ENn<yu9@P|Lu#fVghDu+3+Uyj(G1$TgH$Z+opm+J*VK=
zuf^wz*%&(vO}QGTsHq3FaxT(iWaKow;U^?{xIy9V8c!3YIi;#43XlIfKZy9x$I?>!
zaoyhr2ls_*e={CPIil%c)Y4ureqdjNpTloiM(>ZD4Y7>c0ecSUB?OB%+-2Cd_{RJx
zpL!U+*D!uq->6z~e=+M0dll{dOg;zyTKhA%3EaF~<+S9!a8j+M=<TX4>yO-KNaLBu
z&2{COT<D=gseFMA5AU!&skok<AUVTcy7S%y-aQPbcX4g<mzw_q6ilA3elF{nof4V=
DH(s6M

diff --git a/graphics/backspriteflags.grit b/graphics/backspriteflags.grit
index f204b39..2cd0406 100644
--- a/graphics/backspriteflags.grit
+++ b/graphics/backspriteflags.grit
@@ -1 +1 @@
--gzl -gB4 -fts -pe16 -pzlz77 -gu8 -fh!
\ No newline at end of file
+-gzl -gB4 -fts -pe64 -pzlz77 -gu8 -fh!
\ No newline at end of file
diff --git a/graphics/frontspr/gFrontSprite385Castform.png b/graphics/frontspr/gFrontSprite385Castform.png
index 8c51af3161227afb6435d1106467a86959a338c5..35b922737557815a1cec610c1328f0f8defec442 100644
GIT binary patch
delta 1657
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
DrOW>t

delta 329
zcmV-P0k;0z6151B77GAC2m=5B0G+pi?2#cI1K8N`kwIVvh{)K0u)vY0Di4UrsBoZ&
zU`TMd;NVbjXtCf)0)K#!WOe`m0PsmfK~#90?UlO{0x<|hm&cGM$p8PXKwL-1Mo61e
zI5hXbCK<f0!{KoF8vxje&q+iZ29Mju1amT5zx(BJwmJ6%K-5*l{LB-nd5YdT1ek(`
z0V2jsH&w%${F9;qL{?7jq9%Y>P8LyO$)KV?g3^mp6_d<+m461T2|(4dw?48!tO{i1
zeE>5Vqb|S^T}6i3Sox|zGc*=i7w<6*2Jd)nfDoX6J$_Jq%Yfh1_X=$0zYV>;2DieR
zc|W*N_)lvs15^JBQb2C-wU`=$`eKdgb1!*37GvGu&**iE{_kX+kMNZ3+(H7@YkoK!
b4t1W`(+EpCXAT_Y00000NkvXXu0mjf?jM&-

diff --git a/graphics/frontspriteflags.grit b/graphics/frontspriteflags.grit
index f204b39..2cd0406 100644
--- a/graphics/frontspriteflags.grit
+++ b/graphics/frontspriteflags.grit
@@ -1 +1 @@
--gzl -gB4 -fts -pe16 -pzlz77 -gu8 -fh!
\ No newline at end of file
+-gzl -gB4 -fts -pe64 -pzlz77 -gu8 -fh!
\ No newline at end of file
diff --git a/scripts/data_extractor.py b/scripts/data_extractor.py
index 9653e1b..3180ad6 100644
--- a/scripts/data_extractor.py
+++ b/scripts/data_extractor.py
@@ -189,6 +189,4 @@ GeneralStructTableExtractor(0x74634, SpeciesDict, OutputFolder + "Back_Pic_Coord
 GeneralTableExtractor(0x356F8, SpeciesDict, False, OutputFolder + "Enemy_Elevation_Table.c", "const u8", "gEnemyMonElevation", "", "NUM_SPECIES", 0, NumberOfPokemon, 1, False)
 GeneralTableExtractor(0x138, SpeciesDict, False, OutputFolder + "Icon_Table.c", "const u32", "gMonIconTable", "", "NUM_SPECIES", 0, NumberOfPokemon, 4, False)
 GeneralTableExtractor(0x13C, SpeciesDict, False, OutputFolder + "Icon_Palette_Table.c", "const u8", "gMonIconPaletteIndices", "", "NUM_SPECIES", 0, NumberOfPokemon, 1, False)
-GeneralTableExtractor(0x105E14, SpeciesDict, False, OutputFolder + "Footprint_Table.c", "const u32", "gMonFootprintTable", "", "NUM_SPECIES", 0, NumberOfPokemon, 4, False)
-GeneralStructTableExtractor(0x72114, SpeciesDict, OutputFolder + "Cry_Table.c", "const struct ToneData", "gCryTable", "NUM_SPECIES", NumberOfPokemon, 12, ["type", "key", "length", "pan_sweep", "wav", "attack", "decay", "sustain", "release"], [1, 1, 1, 1, 4, 1, 1, 1, 1], [], True, False, 0)
-GeneralStructTableExtractor(0x72104, SpeciesDict, OutputFolder + "Cry_Table_2.c", "const struct ToneData", "gCryTable2", "NUM_SPECIES", NumberOfPokemon, 12, ["type", "key", "length", "pan_sweep", "wav", "attack", "decay", "sustain", "release"], [1, 1, 1, 1, 4, 1, 1, 1, 1], [], True, False, 0)
+GeneralTableExtractor(0x105E14, SpeciesDict, False, OutputFolder + "Footprint_Table.c", "const u32", "gMonFootprintTable", "", "NUM_SPECIES", 0, NumberOfPokemon, 4, False)
\ No newline at end of file