From 9b6cd383a4154c59442bcfe7cdc41323f088513b Mon Sep 17 00:00:00 2001 From: Blackforest92 Date: Mon, 1 Nov 2021 01:06:39 +0700 Subject: [PATCH] Optimized Rock Wrecker and Hurricane --- data/battle_anim_scripts.s | 2 +- .../backgrounds/new/high_speed.bin | Bin 896 -> 0 bytes .../backgrounds/new/high_speed.png | Bin 855 -> 0 bytes .../hurricane.bin} | Bin .../new/{high_speed.pal => hurricane.pal} | 0 .../backgrounds/new/hurricane.png | Bin 0 -> 519 bytes .../backgrounds/new/rock_wrecker.bin | Bin 896 -> 0 bytes .../backgrounds/new/rock_wrecker.pal | 32 +++++++++--------- .../backgrounds/new/rock_wrecker.png | Bin 1511 -> 0 bytes .../battle_anims/backgrounds/rock_wrecker.png | Bin 1249 -> 0 bytes include/constants/battle_anim.h | 2 +- include/graphics.h | 10 +++--- src/battle_anim.c | 4 +-- src/graphics.c | 23 +++---------- 14 files changed, 29 insertions(+), 44 deletions(-) delete mode 100644 graphics/battle_anims/backgrounds/new/high_speed.bin delete mode 100644 graphics/battle_anims/backgrounds/new/high_speed.png rename graphics/battle_anims/backgrounds/{rock_wrecker_map.bin => new/hurricane.bin} (100%) rename graphics/battle_anims/backgrounds/new/{high_speed.pal => hurricane.pal} (100%) create mode 100644 graphics/battle_anims/backgrounds/new/hurricane.png delete mode 100644 graphics/battle_anims/backgrounds/new/rock_wrecker.bin delete mode 100644 graphics/battle_anims/backgrounds/new/rock_wrecker.png delete mode 100644 graphics/battle_anims/backgrounds/rock_wrecker.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 73aeb92592..03d72f3ea4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6636,7 +6636,7 @@ Move_HURRICANE: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - fadetobg BG_HIGH_SPEED + fadetobg BG_HURRICANE waitbgfadeout launchtask AnimTask_StartSlidingBg 0x5 0x4 0x1000 0x0 0x1 0xffff waitbgfadein diff --git a/graphics/battle_anims/backgrounds/new/high_speed.bin b/graphics/battle_anims/backgrounds/new/high_speed.bin deleted file mode 100644 index ca049478cca1889c44ad706ffadbc7110464f9c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmbu!1yht!6b9f~#THw{e$-FJ784sgQL(!*utmkfM6nYPyTzZ${dQMmoMm)o=b3xn z_nwoG$Vwa8X)7g1j&}d4y$(9+q_Zx%rsX!b)FxN!y6LV*cyad3sF&VBAAK{(OWxvp zte^aU=x>051{oX-F%-iLH$r5jQAR5;##rNwH^D@cOjc-$sVz)1-3&8>BD2gk$6WKw zw?MIlX^Skj#8S&F54oawAKzD6Wp#41Mv1l7g;`>Ka+WH!!A6^Gw#C-aTC>e|JM8?+ zE-Ab1Nw?pdOu1LeKKmVTF#Hasl{u^|*^fBtm~zLRaMCHKopIJV70xSgb*-HST-hp+_MfdlK@gXK_Z)z3?(CiGn{~sa2=mYYpn7 dH)^8>Z@p6&z4yUKpM3VkSKoa1!%vNVX#$JCrpf>S diff --git a/graphics/battle_anims/backgrounds/new/high_speed.png b/graphics/battle_anims/backgrounds/new/high_speed.png deleted file mode 100644 index 08bb2b0de3dd768a622a8a586061d9afb9b879a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 855 zcmV-d1E~CoP)002k?0{{R3gZAU`0000mP)t-s0002R z|No2L_H)($YR&&*#s6Bg_DZDgL7eU}l;$am<|%X4AcNi@V$C30#VJa(skcN40008w zNklMN6{;~q+ zO!^7CC*?*xU@=3)u({PJ@b?Uz1Ij(Mz_IUVs71gxPZ;}#3B3>PETC$XBH+6x3wa$v zX8~(y?k#`Mr^SAB8=r^>|jLH5O{h1(C|p3;Gjip2CuOe?n|yIzr^Z(0eb!KPa=n`dzLSmVGm-SsCVpVcSL&xq$f)Nn7^zAKI*VkJ>W?T zg|aA5#fc35N0951t}R`A+p(~{Vc5B}2W8aiGWwrP#i?y6+-bVBb!FijuXn*hhwvEn zze60jzr}1dwA*Yx!_9$n{@*RpT^w!!EL|K?6h;GkF^4#e1`fZ}Xy7o87LJz>XDB0e z2h=Yx=oJVhX_D0MF)F%9^D5&aslqg0t81mpx^NeV<`oO|1XU;5fvWC86_vaa+3|EC z7}yu9roO5Ac57TxwM{7N7B~$qwYn*1CV}YQsK%<+i3)&_RkjwTT3bc#^bA)h2y{!m z8Suku6)+S_Q9!rmX4&B(4x@l3Dz9CHLQz2F$B`dUCcu#Enk^B9k1|nY1525JYHO5Q h2%K>npTPec_y?2488ib@x4=6h=47d=eI-vi3x1d{4^D8Z>-y7!6C9a$4=urmhemKX9yXbw z*jct&<^Co0Z7`DgexSDyST%I=dcJsN-24t zQc**A4c$xaax@J<^V#shg6VANq^^0fhM)@-fXp~XdRl7qXF`z~AdN#U;Pti#Gf6hn z=RiL!cx~>vQCDISdJe-am_C7i<=_4l!ip^#h#-&c3`r6ptt<3J6m{?#JwqSR67Z{*mf*ljPyPXNvXCMB& zzHaC2{JuQb{dnO`DpD&xq`^x`OFGhv40>lIlLx-?HDM;R!E7;+g{))~*~vjpa*>-n z|%@B zwz7@wZg#L!>|(cW4}00iehv^pq&UbSH-|Yw6ww?N#|YC>#1QM^I43yCDNY;C5Jx;` z#W~K43+leeCFL@~T8Q-uSCwl7X%4QFpxnU0O>XIKbBDX!!>;{vp9ehTkt~mSBA)V$ z=e*!0uawuk@#rn@crQK>pe6f=lTX5F`7Fy9l6~bH-$`_l#1G{szxeIu5B}PJe*vVk B6bJwS diff --git a/graphics/battle_anims/backgrounds/new/rock_wrecker.pal b/graphics/battle_anims/backgrounds/new/rock_wrecker.pal index f17343c316..198e7f034f 100644 --- a/graphics/battle_anims/backgrounds/new/rock_wrecker.pal +++ b/graphics/battle_anims/backgrounds/new/rock_wrecker.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 0 0 -255 246 0 -255 238 0 -255 222 0 -255 205 0 -255 189 0 -255 172 0 -255 156 8 -255 139 8 -255 123 8 -255 106 8 -255 90 8 -255 74 8 -255 49 8 -255 41 8 -246 24 0 +96 192 24 +248 248 216 +248 248 176 +248 240 144 +248 232 120 +248 232 112 +248 216 96 +240 200 88 +232 192 72 +232 184 64 +232 176 56 +224 160 32 +216 152 32 +208 136 40 +192 120 40 +176 88 40 diff --git a/graphics/battle_anims/backgrounds/new/rock_wrecker.png b/graphics/battle_anims/backgrounds/new/rock_wrecker.png deleted file mode 100644 index 97cf4b73af4c1d66ced0caa1cf28a539f506a897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1511 zcmV003wN0{{R3gj(ju0000mP)t-s00030 z_5lCx0RP?q|IGmZy#W8L0RNl_|BDF!dkFt(2>)6L|4In|F$n)D2=*8NZ#0u{000GY zNklvbAO6vw9poC<_ofmykL07?M@lmdXo-yJ{=@NxmbCg0713a}TYfe57m z2~}XB26C*-d*;q#cUk$I z>EGB?sE5_S2C~{r(`#P%u;Y59j|cKK>AnHni)uRXeld`m{+Z!?6DU-8gk9EA3yT7E zNTOUd`4Pa|c*z~VTrLqY`O&U_;JtZ#&SBwJ6QTofF!l7;k}0~wPcG=KAnc$BaCT<_ z@8>M~x>xo)rmaT^L+|Xte-H-jjB&i%X8|?HcC&S`$r~}R2E&=Ck!B&5FHDKPwrjl` zP;wv33AGUoBz(#vS|06EwCdD9K;VOVDZ3SUOvA|U7fWdE6gDo3*HIit%Q$jZp@t-D*aI&xx8_aeUFxgW6%LzM z0<~ob&-6&l6s96T*yA+>zCy~+NFUCA*zMy4uGd^lpr$^g5Nevb)W2Eq;B1LD!z>~V zY|^wyp#y2g1o+zxvdx#kVgj?XIV3>h$ilpFLkFG@anUP*1K^g401kW_9^XbfFo(=G zX<#1%ka;L{zdsh(Z&a9qRtm7|lx0G<*{s!RoOj_1md(Q~V3w5CY`M9nYYScIivg7w zkmYp;kWbffejs%!%dt%g1j(WGiEb}$KX+tFE+Cf!cm?uI9swZns_~w-+HroG6WCDe zOd*w}PS22vSbO84HPXmxj{|>|o2Ab#U^7f@P8T;Z5L=OCDNp-P%$^{QT2hu&)(0dy+p(Uo`^v%lqtw)P6(*$^yzi*^M79eJ{Ukxn$c zSAjr%<8x8Y(y6x<3Di7XeV4|9-&<8F?M=CYeBY}es#4SHAis2~?haf|P)V2e>Vt4Z z{2O_G|2x?8Cm)@_x2*vLD!uK=#r)y~_vQTzYztSU5ckk_u@9)#J)yQ6E<7mgzylAQz@F!#TRdWL0`~nX#$;XpY#VZyQeCn0mz%#fQb>5Xqfg@e$Vh8YXyX-_d zqBkpzu_d7Ij#C{ZjLrn|F6UMz&>f!r@-D^ioYtZblHq9tyjJ1UL=3Rws6A`og} zLvC@a^V!u+kBo}dOy+yFHZ4klp4aDX4hlFqN%ztb94;?v;3W0i;FK^oYw~Df71taKrgSfM$h6(8(2Y5mAcz$>4S__A2;jTL?&v z(SagM%x-ptfHYjM^~u9^vnvK97W#hECL%7XzmKUiQBL{tF^ewGqXX^Gg5# N002ovPDHLkV1iC@&gTFC diff --git a/graphics/battle_anims/backgrounds/rock_wrecker.png b/graphics/battle_anims/backgrounds/rock_wrecker.png deleted file mode 100644 index ca50da7b76be898616327410ffb07c75e5fbd5d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1249 zcmeAS@N?(olHy`uVBq!ia0vp^4nSA|DI)Syc>J@v}D!U2f;;5(uYEnls5>bt>tc- z_apt{(;3T)1-`f>W;#h}F*^DS=rAo~VX^%prR3`|v0uUH$iH7FW_tVjK36#LW@Fag zGfzE!X*bPVxB0NngVI9=0$;9pyM5SqV9wb_mDwUwjJ7qY+*J9}uW=J$fGx$b>8~F_Q|7-yzszdsevT`AKvLUisrHiuh8&({pNF8P~ds*JMR{r*ZE-eLi6C_sSW)mFFH>?QEK%)!qWa| z->PeZHsx!|g-hgDEx#K0_1yC9#ow2&)mmMm^mL#1-}BF9*;w-W&YB6SWHZlZcjodw z^V-2EoIyv>$8tUM_euW0