From 2d5ed4a1e2aad32f2b7e24ac57c8b6fbc7e80c7d Mon Sep 17 00:00:00 2001
From: Blackforest92 <rico.anjaya@gmail.com>
Date: Tue, 2 Nov 2021 12:53:11 +0700
Subject: [PATCH] Allow Giga Impact fadein background & upgrade its graphic

---
 data/battle_anim_scripts.s                    |  24 +++++++++++++-----
 .../battle_anims/backgrounds/giga_impact.pal  |  19 --------------
 .../backgrounds/new/giga_impact.pal           |  19 ++++++++++++++
 .../backgrounds/new/giga_impact.png           | Bin 0 -> 2395 bytes
 .../backgrounds/new/giga_impact_contest.bin   |   3 +++
 .../backgrounds/new/giga_impact_opponent.bin  | Bin 896 -> 896 bytes
 .../backgrounds/new/giga_impact_opponent.pal  |  19 --------------
 .../backgrounds/new/giga_impact_opponent.png  | Bin 3056 -> 0 bytes
 .../backgrounds/new/giga_impact_player.bin    | Bin 896 -> 896 bytes
 .../backgrounds/new/giga_impact_player.pal    |  19 --------------
 .../backgrounds/new/giga_impact_player.png    | Bin 3098 -> 0 bytes
 .../backgrounds/new/spacial_rend_opponent.bin |   3 ---
 .../backgrounds/new/spacial_rend_player.bin   | Bin 896 -> 0 bytes
 include/graphics.h                            |   8 +++---
 src/battle_anim.c                             |  10 ++++----
 src/graphics.c                                |  17 +++++--------
 16 files changed, 55 insertions(+), 86 deletions(-)
 delete mode 100644 graphics/battle_anims/backgrounds/giga_impact.pal
 create mode 100644 graphics/battle_anims/backgrounds/new/giga_impact.pal
 create mode 100644 graphics/battle_anims/backgrounds/new/giga_impact.png
 create mode 100644 graphics/battle_anims/backgrounds/new/giga_impact_contest.bin
 delete mode 100644 graphics/battle_anims/backgrounds/new/giga_impact_opponent.pal
 delete mode 100644 graphics/battle_anims/backgrounds/new/giga_impact_opponent.png
 delete mode 100644 graphics/battle_anims/backgrounds/new/giga_impact_player.pal
 delete mode 100644 graphics/battle_anims/backgrounds/new/giga_impact_player.png
 delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin
 delete mode 100644 graphics/battle_anims/backgrounds/new/spacial_rend_player.bin

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 03d72f3ea..6b417944e 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -2502,15 +2502,24 @@ Move_GIGA_IMPACT:
 	waitforvisualfinish
 	delay 11
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5
-	delay 6
-	@monbg ANIM_DEF_PARTNER
-	@setalpha 12, 8
-	@createvisualtask AnimTask_WindUpLunge, 5, 7, 0, -18, 8, 23, 10, 40, 10
-	@delay 35
-	createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 31, 3, 1, 0, 10, 0, 0
+	createvisualtask AnimTask_IsContest, 2
+	jumprettrue SetGigaImpactContestsBG
+	createvisualtask AnimTask_IsTargetPlayerSide, 2
+	jumpretfalse SetGigaImpactOpponentBG
+	goto SetGigaImpactPlayerBG
+SetGigaImpactOpponentBG:
+	fadetobg BG_GIGA_IMPACT_OPPONENT
+	goto GigaImpactContinuity
+SetGigaImpactPlayerBG:
+	fadetobg BG_GIGA_IMPACT_PLAYER
+	goto GigaImpactContinuity
+SetGigaImpactContestsBG:
+	fadetobg BG_GIGA_IMPACT_CONTEST
+	goto GigaImpactContinuity
+GigaImpactContinuity:
+	waitbgfadeout
 	createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0
 	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
-	call SetImpactBackground
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate 2, 5, 1, -16, 0, 0, 4
 	waitforvisualfinish
@@ -2525,6 +2534,7 @@ Move_GIGA_IMPACT:
 	blendoff
 	restorebg
 	waitbgfadein
+	waitforvisualfinish
 	end
 
 Move_NASTY_PLOT:
diff --git a/graphics/battle_anims/backgrounds/giga_impact.pal b/graphics/battle_anims/backgrounds/giga_impact.pal
deleted file mode 100644
index 944174076..000000000
--- a/graphics/battle_anims/backgrounds/giga_impact.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 214 0
-255 197 0
-255 173 0
-255 165 0
-148 90 222
-255 107 0
-255 132 0
-255 148 0
-255 156 41
-0 0 0
-0 90 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/new/giga_impact.pal b/graphics/battle_anims/backgrounds/new/giga_impact.pal
new file mode 100644
index 000000000..06f02604a
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/new/giga_impact.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+240 136 184
+232 104 168
+136 8 40
+248 24 104
+216 32 96
+224 72 136
+160 0 48
+216 0 64
+200 40 88
+192 0 56
+176 32 128
+176 24 72
+152 16 56
+200 48 80
+216 56 160
diff --git a/graphics/battle_anims/backgrounds/new/giga_impact.png b/graphics/battle_anims/backgrounds/new/giga_impact.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d5d705fe32a0bc2f3922e8dcecad12a06272eed
GIT binary patch
literal 2395
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
N002ovPDHLkV1kimT~`1A

literal 0
HcmV?d00001

diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_contest.bin b/graphics/battle_anims/backgrounds/new/giga_impact_contest.bin
new file mode 100644
index 000000000..03c709bb9
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/new/giga_impact_contest.bin
@@ -0,0 +1,3 @@
+�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � D!E!F!G!H!I!@!�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � � � � � � � � �$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � 
+!!!
!!!!�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � !!!!!!!�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � *!+!,!-!.!/!"!�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � :!;!<!=!>!?!2!�$�$�$�$�$�$�$�$�$� � � � � � � � � � � � � � � � J!K!L!M!N!O!B!�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(J)K)L)M)N)O)B)�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(:);)<)=)>)?)2)�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(*)+),)-).)/)")�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�()))))))�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(
+)))
))))�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(�(D)E)F)G)H)I)@)
\ No newline at end of file
diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin b/graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin
index a55ff2f56d9a53ef07152d362167283f90593bd6..0cfa1f1ec6dca34cd21cca537bd29b56db5bc585 100644
GIT binary patch
literal 896
zcmV~$=}!m%7zg0ZN5tl%&^!CR+dF<Qn~##Lkt4^y)Lo?eq|$vjN_V-ti<It5(p`$$
zd{p6iuINp@q1QEBujy4yMGBJf5J`A|`$$9r;t_{f#2^|`h(x4BNwmaBti(yYBuJwC
z#y|YUKK8JSKPbWz6ruq6c#KELLoRZVjVxp$1L;UZnxspHWJ;D~OOE79o*dAldPD>C
zupZKb`VzIM!3#XcGdx8#s!)jvl%ou#C_yobr9?`lOv<G~Dy2%Q<(LNPDLtttG*FN0
z2fW8Syu};5#w)a;6)k8+6B^Ngdeos#>ZL&%rAeBlMOvjzPV0F+r>@kqdPcus2!r^H
z0er$o^rH{G=s`ES(1{MTqg^_rQ@W&EdZbtSq+c#*s9x3(y`;f<QNLpz-!O--n8ggH
zF@;G?U>su@#R!HmEF&^1V=^uiGAUCsEn#|3@9G`Btr2=lcd(6L_=zoS;s-Xcjy0@e
z1<P2%A{MY9i?SrkvLdUpChM{xVSdl=`W?UR5q`^exXoYu$t`a32RFFRHLh}n%Ut3j
z7r0=Hwq(n;Vym`h>$YJRJk&3Hh+pzxzv$mN&u^ULSI%;V)12ZYCpgYAj&g*<9JUb~
zwJ{sF37fPjo3_(_-p{!^{j8tyFC5|^KXZVe_>ukWV=sHy%`SGbgY9g$4(qfo>$V>2
zwLa^&V;<zE{G^}oKtJvu_@3|hmT&l)uh_;`wy>E^Y-9uLS;so7w+3spCTq49Yqd5z
z;79$42l!z><OlsFYgxk=e9mWl%4$}zk`*jx8B1BhVisG8m0FpVTZL6xl~vns{^MWn
zbC0|H!y-OmAq$w#$9%**<}!!b%wi@pn9ek&S-NFdre#^S<yfxe*%iO(H~hMX`!&Dn
osZ3!qA2Nv#c%O+(U_9d(%NRy8ijj=8D2uiji?uk5w**VH|9|pY-T(jq

literal 896
zcmZ{g1CSj-6h$*@?_b8rdEv&!#>vLEZQHhO+qP}nwrwZ9JzKM>UqAKgP4~RM=k~2O
zaKafE469sm!yOMi@xmJ)eDT8{8vz8WZ;<L>LI@>h6cLNq#33&6h))7NO9*Ne5|NlB
zBqbTi2_pq5NkwYXkd}0$CxdmPK}Ir>nJi=_8`%jb2RX?_Zt{?qeB`G95foHih{6=1
zD8(pF3C)+J6s0LcS^Zaz@>HNAm8eV=s#1;W)SxD{6kA($1a+uOJ?hhdhMH(ZW17&E
zW;CY-Ev-zgXiXd1(vJ3Y&}1ZSR!2I~nJ$(#`t7>XjqdcIC%x#cUaAj$>1S~!-Jbyr
zWDtWL@Ix5NForWi)ksD$nlW~?=`ogZjCa6CCo!17L?$uWAwPwwDqW;{8q=A<OlC2g
zIm~4q^YwfI3t7Zsmax>$VHwL=!Ae$X-D=jbmUXOW0~_^Z6Pww>R<^O79qeQmyX_qI
zu$O)8*Xn;0oBIPC<Pe9|=@FIjD91R?2~I|NoZ>WRIIB+1{f9SQ&U1l_T;eiUxXLxI
zbAy}Q;x>1<%RR;4*Zcz>@<{K(!yfa5r#$01FL=o-Uh{^xO8JiWeBdLW_{<l+@{RBO
z;HRd3@msBbh#`hJiL<zftGJ1~c!+_gc!{_8h_CpGzu3g4yaFUpf+Sc%BvdI3{sN2^
B$jtx%

diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_opponent.pal b/graphics/battle_anims/backgrounds/new/giga_impact_opponent.pal
deleted file mode 100644
index 2fdba24f6..000000000
--- a/graphics/battle_anims/backgrounds/new/giga_impact_opponent.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-41 49 49
-106 139 189
-246 131 180
-255 0 255
-255 16 98
-238 98 164
-230 65 131
-222 0 57
-222 24 90
-205 41 74
-205 32 82
-189 0 49
-172 16 65
-156 0 41
-148 16 49
-131 8 32
diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_opponent.png b/graphics/battle_anims/backgrounds/new/giga_impact_opponent.png
deleted file mode 100644
index cfa8c07c8d8702cc010fc8b8ce38c5b8a3b60532..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3056
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

diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_player.bin b/graphics/battle_anims/backgrounds/new/giga_impact_player.bin
index bfee2cb88b56b2600cc0e184abd3d7013f087367..3b89218e0e6cbba254e78a9f11abe717002cba8a 100644
GIT binary patch
literal 896
zcmWN@WnfSR0EJP(KuNpfyW8FN9z0+@n)P5wV@qR8V@qRzG}zME(%912(%7y?V|Sik
zC&BTKvmNUg%NRrqvHvHIcoGN*X-*3wTGEQvG^7!YX+l$)QIGm$INfPZb&8Xn<U}Wu
zL^3I)l14fiw4p8SXio<^(uvOe#LxV~ul&aEe8=|`INy2Bb&j*0<xFRiMK(F)l1DxT
zbfGJS6j4kGrIc}sPSt5@pwo4RPEtMfbszV3FZXm0cXu~;qdPt5NiTZShrV3NRb0(A
zT+4M_&kdZb^K`y0(1p54XX-2s^$-vCAP@8a_jf<{qdx-}$RGwYgrVHXP29{a+{$g-
z&K+2BidTXHg+kI;kMU@a@<@;Ha1Zk^hBJbZjAArn7|Wg9#ogS)z1+wBJV2__l&%c5
zQClS{NmD(=lRe23J;CEW&f^%*1ST?x$xLA?5AqNX^9a+J&ZEpAS9!`;fx4)xGL@wT
zp6_{{>p7n7S)S>c%wjfkn9Drovw+8VoF{mar+AuYc$Po-lfU?zfB2Ul_>mP}?qy!;
zC0^`BUg(7^Vlhit$}*O-g6DXi7kH7Ec$rstm4<4h#%iLbYNq-+SsT3G>%7)$yxOb0
z(kofTYSyrpb*yItukku>@Fs8ZHt+B*7wZyTs>^h_uF%;!M?1XT+q~6VyxE()(Hq&s
zX11`EZER-;@9{n#@F5@ZF`w`$&DBDYTB?;=D@L(8;Qij`z24*9-sPR%$u4%YhrR4$
zKL_}X&-sEc`HHXkhHq)7_UfRH>ZHy}R*LFe>l#<P%9XBgxyz}bk}9gHp_V!ha)`qm
z;V8#A&It-tq+*q*RAtImj_RV?s3xk8s-nuMA}Wu{gNmRss0ylsnxHnQ3l0W{g2Ta)
b;An6xI3An`3d5qXI4lWE!?G|t%nAPkZ{ZTI

literal 896
zcmY+C1CU%n5I}SPY$g}qo8;n+FV@AjZQIty$;P&A+qP}ncKXlm)n#j{TGOw)r)yj=
z<hW|-hP!AFJhkVAx7I!)eeuIzdj<gn5=1Z|gvtpcuEgUJPJ9xOQ0zn`)|p92N(7+9
zOGa`cbu@+0DM>|Y(r7*{=_GC;JsHSICb2V<MQ3Iuifm-pb`ElqORU`FA+N;qk)HyZ
zHwd>xQ;<RwrU*qPrx?XGQ-YF|qO{m$C`&of<*7hLqAiuEOcn9X`OViGRHYi#sX<L@
zQJXr{m799hrvVM+wh@g*HleA`wG#%-9DH+HNW3MjXiXd1(vJ3Ypd+2=Oc%N7N;fCY
zpgTS2NiWSuME0f+ed$Mk1~3pSgBZ*ZhBA!dj9?_AG;L$F)?*ke8yv@YY!-9=2~1=X
zlbOO)rU`9jIy0EbEM_x@xy)m}a0^(-BBCsdS;A75v0P#+bpMsCVl``6%R1JxfsJfp
zGh5ioHmS9p9qeQmyV=8D_OV}+<^~RM(DD959G1)@9OW3tIl)Ozahfxn<s9d^z(tuf
zW@paYoc|J+xgz{ku5n#h^W4z#CbziF9qw|E`#j(wkMss&Ync3Fp74}sJm-ajw%2&c
zD_--4x4h#$ANZ(Q8=v^h7rydM{;<h^=ZAFv$uE98@n)4j{3VWZQHC;mx+*v2t~`{d
n@>1T)NBJs~_f!7LN`MMf_P+niAQh}aRHzEmeC*sYmdXDE+`ibE

diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_player.pal b/graphics/battle_anims/backgrounds/new/giga_impact_player.pal
deleted file mode 100644
index ea01813a9..000000000
--- a/graphics/battle_anims/backgrounds/new/giga_impact_player.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-255 0 255
-255 16 98
-246 131 180
-238 98 164
-230 65 131
-222 0 57
-222 24 90
-205 32 82
-205 41 74
-189 0 49
-172 16 65
-156 0 41
-148 16 49
-131 8 32
diff --git a/graphics/battle_anims/backgrounds/new/giga_impact_player.png b/graphics/battle_anims/backgrounds/new/giga_impact_player.png
deleted file mode 100644
index b258035e343ddd983c12bf8098ed54eac3aa8430..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3098
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

diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin
deleted file mode 100644
index 0cfa1f1ec..000000000
--- a/graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-@%I%H%G%F%E%D%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � �$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � %%%
%%%
-%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � %%%%%%%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � "%/%.%-%,%+%*%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � 2%?%>%=%<%;%:%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � B%O%N%M%L%K%J%�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$�$� � � � � � � � � B-O-N-M-L-K-J-�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(2-?->-=-<-;-:-�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�("-/-.---,-+-*-�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(-------�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(---
---
--�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(@-I-H-G-F-E-D-�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�(�(�(�(�(�(�(�(�(
\ No newline at end of file
diff --git a/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin b/graphics/battle_anims/backgrounds/new/spacial_rend_player.bin
deleted file mode 100644
index 3b89218e0e6cbba254e78a9f11abe717002cba8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 896
zcmWN@WnfSR0EJP(KuNpfyW8FN9z0+@n)P5wV@qR8V@qRzG}zME(%912(%7y?V|Sik
zC&BTKvmNUg%NRrqvHvHIcoGN*X-*3wTGEQvG^7!YX+l$)QIGm$INfPZb&8Xn<U}Wu
zL^3I)l14fiw4p8SXio<^(uvOe#LxV~ul&aEe8=|`INy2Bb&j*0<xFRiMK(F)l1DxT
zbfGJS6j4kGrIc}sPSt5@pwo4RPEtMfbszV3FZXm0cXu~;qdPt5NiTZShrV3NRb0(A
zT+4M_&kdZb^K`y0(1p54XX-2s^$-vCAP@8a_jf<{qdx-}$RGwYgrVHXP29{a+{$g-
z&K+2BidTXHg+kI;kMU@a@<@;Ha1Zk^hBJbZjAArn7|Wg9#ogS)z1+wBJV2__l&%c5
zQClS{NmD(=lRe23J;CEW&f^%*1ST?x$xLA?5AqNX^9a+J&ZEpAS9!`;fx4)xGL@wT
zp6_{{>p7n7S)S>c%wjfkn9Drovw+8VoF{mar+AuYc$Po-lfU?zfB2Ul_>mP}?qy!;
zC0^`BUg(7^Vlhit$}*O-g6DXi7kH7Ec$rstm4<4h#%iLbYNq-+SsT3G>%7)$yxOb0
z(kofTYSyrpb*yItukku>@Fs8ZHt+B*7wZyTs>^h_uF%;!M?1XT+q~6VyxE()(Hq&s
zX11`EZER-;@9{n#@F5@ZF`w`$&DBDYTB?;=D@L(8;Qij`z24*9-sPR%$u4%YhrR4$
zKL_}X&-sEc`HHXkhHq)7_UfRH>ZHy}R*LFe>l#<P%9XBgxyz}bk}9gHp_V!ha)`qm
z;V8#A&It-tq+*q*RAtImj_RV?s3xk8s-nuMA}Wu{gNmRss0ylsnxHnQ3l0W{g2Ta)
b;An6xI3An`3d5qXI4lWE!?G|t%nAPkZ{ZTI

diff --git a/include/graphics.h b/include/graphics.h
index 78d9f2c42..58a5ec27d 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4937,10 +4937,13 @@ extern const u32 gBattleAnimBgImage_Hurricane[];
 extern const u32 gBattleAnimBgPalette_Hurricane[];
 extern const u32 gBattleAnimBgTilemap_Hurricane[];
 extern const u32 gBattleAnimBgPalette_RockWrecker[];
+extern const u32 gBattleAnimBgTilemap_GigaImpactPlayer[];
+extern const u32 gBattleAnimBgTilemap_GigaImpactOpponent[];
+extern const u32 gBattleAnimBgTilemap_GigaImpactContest[];
+extern const u32 gBattleAnimBgImage_GigaImpact[];
+extern const u32 gBattleAnimBgPalette_GigaImpact[];
 extern const u32 gBattleAnimBgImage_SpacialRend[];
 extern const u32 gBattleAnimBgPalette_SpacialRend[];
-extern const u32 gBattleAnimBgTilemap_SpacialRendOpponent[];
-extern const u32 gBattleAnimBgTilemap_SpacialRendPlayer[];
 extern const u32 gBattleAnimBgImage_DarkVoid[];
 extern const u32 gBattleAnimBgPalette_DarkVoid[];
 extern const u32 gBattleAnimBgTilemap_DarkVoid[];
@@ -4961,7 +4964,6 @@ extern const u32 gBattleAnimBgPalette_Fissure[];
 extern const u32 gBattleAnimBgPalette_Bug[];
 extern const u32 gBattleAnimBgPalette_Solarbeam[];
 extern const u32 gBattleAnimBgPalette_MagmaStorm[];
-extern const u32 gBattleAnimBgPalette_GigaImpact[];
 extern const u32 gBattleAnimBgPalette_TrickRoom[];
 extern const u32 gBattleAnimBgTilemap_Dark[];
 extern const u32 gBattleAnimBgTilemap_Ghost[];
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 44a382296..6f4e5b54e 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2052,13 +2052,13 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
     [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests},
     //new bgs
     [BG_MAGMA_STORM] = {gBattleAnimBgImage_InAir, gBattleAnimBgPalette_MagmaStorm, gBattleAnimBgTilemap_InAir},
-    [BG_GIGA_IMPACT_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_ImpactOpponent},
-    [BG_GIGA_IMPACT_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_ImpactPlayer},
-    [BG_GIGA_IMPACT_CONTEST] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_ImpactContests},
+    [BG_GIGA_IMPACT_OPPONENT] = {gBattleAnimBgImage_GigaImpact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_GigaImpactOpponent},
+    [BG_GIGA_IMPACT_PLAYER] = {gBattleAnimBgImage_GigaImpact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_GigaImpactPlayer},
+    [BG_GIGA_IMPACT_CONTEST] = {gBattleAnimBgImage_GigaImpact, gBattleAnimBgPalette_GigaImpact, gBattleAnimBgTilemap_GigaImpactContest},
     [BG_TRICK_ROOM] = {gBattleAnimBgImage_TrickRoom, gBattleAnimBgPalette_TrickRoom, gBattleAnimBgTilemap_TrickRoom},
     [BG_ROCK_WRECKER] = {gBattleAnimBgImage_Hurricane, gBattleAnimBgPalette_RockWrecker, gBattleAnimBgTilemap_Hurricane},
-    [BG_SPACIAL_REND_ON_OPPONENT] = {gBattleAnimBgImage_SpacialRend, gBattleAnimBgPalette_SpacialRend, gBattleAnimBgTilemap_SpacialRendOpponent},
-    [BG_SPACIAL_REND_ON_PLAYER] = {gBattleAnimBgImage_SpacialRend, gBattleAnimBgPalette_SpacialRend, gBattleAnimBgTilemap_SpacialRendPlayer},
+    [BG_SPACIAL_REND_ON_OPPONENT] = {gBattleAnimBgImage_SpacialRend, gBattleAnimBgPalette_SpacialRend, gBattleAnimBgTilemap_GigaImpactOpponent},
+    [BG_SPACIAL_REND_ON_PLAYER] = {gBattleAnimBgImage_SpacialRend, gBattleAnimBgPalette_SpacialRend, gBattleAnimBgTilemap_GigaImpactPlayer},
     [BG_DARK_VOID] = {gBattleAnimBgImage_DarkVoid, gBattleAnimBgPalette_DarkVoid, gBattleAnimBgTilemap_DarkVoid},
     [BG_WATER] = {gBattleAnimBgImage_HydroPump, gBattleAnimBgPalette_HydroPump, gBattleAnimBgTilemap_HydroPump},
     [BG_NIGHTMARE] = {gBattleAnimBgImage_Nightmare, gBattleAnimBgPalette_Nightmare, gBattleAnimBgTilemap_Nightmare},
diff --git a/src/graphics.c b/src/graphics.c
index 5ba3af42b..5dccdd2c2 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1395,7 +1395,6 @@ const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/b
 const u32 gBattleAnimBgPalette_MagmaStorm[] = INCBIN_U32("graphics/battle_anims/backgrounds/magma_storm.gbapal.lz");
 
 //new battle bgs
-const u32 gBattleAnimBgPalette_GigaImpact[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact.gbapal.lz");
 
 //const u32 gBattleAnimBgImage_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/trick_room.4bpp.lz");
 //const u32 gBattleAnimBgPalette_TrickRoom[] = INCBIN_U32("graphics/battle_anims/backgrounds/trick_room.gbapal.lz");
@@ -1407,10 +1406,14 @@ const u32 gBattleAnimBgTilemap_Hurricane[] = INCBIN_U32("graphics/battle_anims/b
 
 const u32 gBattleAnimBgPalette_RockWrecker[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/rock_wrecker.gbapal.lz");
 
+const u32 gBattleAnimBgTilemap_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.bin.lz");
+const u32 gBattleAnimBgTilemap_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin.lz");
+const u32 gBattleAnimBgTilemap_GigaImpactContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_contest.bin.lz");
+const u32 gBattleAnimBgImage_GigaImpact[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact.4bpp.lz");
+const u32 gBattleAnimBgPalette_GigaImpact[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact.gbapal.lz");
+
 const u32 gBattleAnimBgImage_SpacialRend[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend.4bpp.lz");
 const u32 gBattleAnimBgPalette_SpacialRend[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend.gbapal.lz");
-const u32 gBattleAnimBgTilemap_SpacialRendOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_opponent.bin.lz");
-const u32 gBattleAnimBgTilemap_SpacialRendPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/spacial_rend_player.bin.lz");
 
 const u32 gBattleAnimBgImage_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.4bpp.lz");
 const u32 gBattleAnimBgPalette_DarkVoid[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark_void.gbapal.lz");
@@ -1463,14 +1466,6 @@ const u32 gBattleAnimBgTilemap_FocusBlast[] = INCBIN_U32("graphics/battle_anims/
 
 const u32 gBattleAnimBgPalette_GarbageFalls[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/garbage_falls.gbapal.lz");
 
-const u32 gBattleAnimBgImage_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.4bpp.lz");
-const u32 gBattleAnimBgPalette_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.gbapal.lz");
-const u32 gBattleAnimBgTilemap_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_opponent.bin.lz");
-
-const u32 gBattleAnimBgImage_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.4bpp.lz");
-const u32 gBattleAnimBgPalette_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.gbapal.lz");
-const u32 gBattleAnimBgTilemap_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/giga_impact_player.bin.lz");
-
 const u32 gBattleAnimBgImage_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.4bpp.lz");
 const u32 gBattleAnimBgPalette_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.gbapal.lz");
 const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new/grassy_terrain.bin.lz");