From 9f7267e48d7e4274cb692a7398e64ba7adac5073 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Thu, 9 Feb 2023 11:29:29 +0100 Subject: [PATCH] Fix Giga Impact on contests. --- data/battle_anim_scripts.s | 1 - .../backgrounds/giga_impact_contest.bin | 6 +++--- .../backgrounds/giga_impact_contest.png | Bin 0 -> 1251 bytes include/graphics.h | 1 + src/data/battle_anim.h | 2 +- src/graphics.c | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/giga_impact_contest.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 9080c075e..f97853d84 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2644,7 +2644,6 @@ GigaImpactContinuity: delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 - waitbgfadeout createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0 playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 diff --git a/graphics/battle_anims/backgrounds/giga_impact_contest.bin b/graphics/battle_anims/backgrounds/giga_impact_contest.bin index 03c709bb9..ce383cf24 100644 --- a/graphics/battle_anims/backgrounds/giga_impact_contest.bin +++ b/graphics/battle_anims/backgrounds/giga_impact_contest.bin @@ -1,3 +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 +         $$ $$$$$ +             $$ $$$$$        ! " # $ % & ' (  ) * + , ,$+$*$)$ ($'$&$%$- . / 0 1 2 3 4 5 6 7 8 9 : ; < = > >$=$<$;$:$9$8$7$6$ ? @ A B C D E E F F$E E D$C$B$A$@$?$G H I J K L M N O P Q E E E E Q$P$O$N$M$L$K$R S T U V W X Y Z [ \ ] ^ _ ` a b E E E E E E E E b$a$`$_$^$ c d e f g h i j k ^(_(`(a(b(E E E E E E E E b,a,`,_,^, c(d(e(f(g(h(i(j(k( K(L(M(N(O(P(Q(E E E E Q,P,O,N,M,L,K,R(S(T( U(V(W(X(Y(Z([(\(](?(@(A(B(C(D(E E F(F,E E D,C,B,A,@,?,G(H(I(J( 6(7(8(9(:(;(<(=(>(>,=,<,;,:,9,8,7,6, %(&('((( )(*(+(,(,,+,*,), (,',&,%,-(.( /(0(1( 2(3(4(5( ((((( ((,, ,,,,, ((( (((( ( !("(#($( ((((( ((,, ,,,,, +( ( ( (( (( \ No newline at end of file diff --git a/graphics/battle_anims/backgrounds/giga_impact_contest.png b/graphics/battle_anims/backgrounds/giga_impact_contest.png new file mode 100644 index 0000000000000000000000000000000000000000..80698b8d8b0fdcfd59d445b67b55efd8025fa751 GIT binary patch literal 1251 zcmV<91RVQ`P)Px#Fi=cXMF0Q*@QAqRXsCz?DEJs?*dSowNQj^SFxUV<$S7FA064H9fUp=ym=HL~ zFi_YypqBQ*z5oCOVM#X5n|(h|(ACl>@q_qLG1#{4z=!ht7v`F&29OBYe=2%Na8x1+0PW!wfTKnL zB7vI-^6rvBe%=|t_7?!>mH@`FAXK>nUBL7U0LH*Q25_S>02AOd6VxDp0Dv(#o&iki z6M*?RfxtBvoI?m&44wc;@)JNLnDj9XfO)`eGzK$(bK~K6-}RgG zy9+c;0+>TE>EDN7v3*nJ8^Fi$1IW<^rCDf;_DQSv{Jof)xOfr(Ja^UjX=?W82}qfbJjD05AzO1EAagqL05*gM1-q2>axKng*vYNx%R= zbpKksggafTIWQ2M;B?OiuM|Xku*5@SgKI(ffCufL#V6EQ8qkW*1ME)^2r|I2HHF`FJ zoFvW{ljYX{Og-&CeRapSur~rXbqPRyYbO9V$}a#0^&@rZoZ0&>5s)G|nhO$uMgSY# zG0eQ7Cf^J&svqT$D6Lf>(5z3O3zBAz0mL`S9kA%OBfun&-zx`nxB*z^Lik9NLZB0(>j=yNHUBkK{TvesKoUsOVKJm+i#2&Nf-Sx%0Rs5w z0tC=Az>UNg;}@kuu#sNuYXK$#TLIvg0A`vK*qmD0aoxD9vi7F{hEEDeun`wD0tCm#Pwps;UzZ)O`&J3!q#0%K5l{{T$bm7YSeKH1Wn5pQJ3irYb_#_0L5x^24 zgv<4L96Q4`jdXm?1TdVbC4U_faQ$XX`y$guvdb8`JGDKwHH8ph`4$2%MUn!H;zgeT zNC<-m#?cpBSR+^g2;z7h(ahjlWq}eVZ>%403&FwzK~#s!2msSL(fq3Bn@8ot)1$Qx zZn8Sc8*`o)ED?N}cT%oV4r(ONT=yoHXvh<7; zcJ@v^&Jbk2$Or0lnsbk<98W?(_1z2gC?{S)I|%{U2LN(N*{1(W{HYZTN>BkTXbSL5 zy~OCP`tU~|We3aM`=NHTNAmsK^v^yM!2V5Mu77apwX$Ql6x?~>UOyZQ{WZZbP>)BS zVr`0aAVGW4{BHE4xcX+jSphvG>F&bvcK|-eK9~3%0Q12A0Pz0<;2%7;iBYWO5gq^l N002ovPDHLkV1hd`D|-L{ literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index e5a47ca88..55174442c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9981,6 +9981,7 @@ extern const u32 gBattleAnimBgTilemap_GigaImpactPlayer[]; extern const u32 gBattleAnimBgTilemap_GigaImpactOpponent[]; extern const u32 gBattleAnimBgTilemap_GigaImpactContest[]; extern const u32 gBattleAnimBgImage_GigaImpact[]; +extern const u32 gBattleAnimBgImage_GigaImpactContest[]; extern const u32 gBattleAnimBgPalette_GigaImpact[]; extern const u32 gBattleAnimBgImage_SpacialRend[]; extern const u32 gBattleAnimBgPalette_SpacialRend[]; diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index 5be53fe66..b1f158310 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -1937,7 +1937,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = [BG_MAGMA_STORM] = {gBattleAnimBgImage_InAir, gBattleAnimBgPalette_MagmaStorm, gBattleAnimBgTilemap_InAir}, [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_GIGA_IMPACT_CONTEST] = {gBattleAnimBgImage_GigaImpactContest, 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_GigaImpactOpponent}, diff --git a/src/graphics.c b/src/graphics.c index c8040a827..f1ffeb56c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1381,6 +1381,7 @@ const u32 gBattleAnimBgTilemap_GigaImpactPlayer[] = INCBIN_U32("graphics/battle_ const u32 gBattleAnimBgTilemap_GigaImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact_opponent.bin.lz"); const u32 gBattleAnimBgTilemap_GigaImpactContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact_contest.bin.lz"); const u32 gBattleAnimBgImage_GigaImpact[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact.4bpp.lz"); +const u32 gBattleAnimBgImage_GigaImpactContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact_contest.4bpp.lz"); const u32 gBattleAnimBgPalette_GigaImpact[] = INCBIN_U32("graphics/battle_anims/backgrounds/giga_impact.gbapal.lz"); const u32 gBattleAnimBgImage_SpacialRend[] = INCBIN_U32("graphics/battle_anims/backgrounds/spacial_rend.4bpp.lz");