From 2fa4206bf19ac9d03a62cc0597bc443aa0e71859 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Mon, 4 Sep 2023 17:48:43 -0500 Subject: [PATCH] Add new Substitute doll sprites (#3263) --- graphics/battle_anims/sprites/monster_doll.png | Bin 441 -> 398 bytes graphics/battle_anims/sprites/substitute.png | Bin 446 -> 430 bytes .../battle_anims/sprites/substitute_back.png | Bin 405 -> 523 bytes .../sprites/substitute_back_new.png | Bin 488 -> 0 bytes .../battle_anims/sprites/substitute_new.png | Bin 420 -> 0 bytes include/graphics.h | 9 +++------ src/battle_gfx_sfx_util.c | 9 +++++---- src/data/battle_anim.h | 8 -------- src/graphics.c | 10 +++------- 9 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 graphics/battle_anims/sprites/substitute_back_new.png delete mode 100644 graphics/battle_anims/sprites/substitute_new.png diff --git a/graphics/battle_anims/sprites/monster_doll.png b/graphics/battle_anims/sprites/monster_doll.png index 55706275c5511ee97fd660f4c092efb4787b79c1..7cac68e109c38af1bfb82bc5c28d3fca4c46748f 100644 GIT binary patch delta 383 zcmV-_0f7Fw1C9fb7=H)@0000)q>9D>0004VQb$4nuFf3k0000mP)t-sapl)aV>+e1 zga7~ldyHC?rE9&`oM>=RQc_CD;Hdcc`2YX^*3QMfy|rj?NB{r;D`h`t0003DNkl@?z{9M@D)azn93qK7Vu~2bQ3Mi0RIU$?&!AdcFhYoB0& zrzoVUFHNohO9Fu~psKmS8@h76ABx>02Ej!y;(PjD d%!~fD{s1K|3SSJ>GU@;T002ovPDHLkV1i>Xs{#N3 delta 427 zcmV;c0aX5u1Gxi`7=Hu<0001iRA6mPeymE)#^yqmys%2o5yBBq0BDEVoJlbv?1KJG~XfyFwGJiN>(zH~~)c5H(@8uFg zie-_1YdRvt{sWhUe68x*@_NMfMl}c_<;HueYv>|&{jjRvRNa?|yxe2y|1G{nUUr@O zhy%YH)}R7|c0004VQb$4nuFf3k0000mP)t-sapl)aV>+e1 zga7~ldyHC?rE9&`oM>=RQc_CD;Hdcc`2YX^*3QMfy|rj?NB{r;D`h`t0003jNkljKl4k9dLL103TtaLRE{9tI5iJX!bcE_5j=PE=+QkBJs?Pr>V0^r4Dk8S z?jI3A9J)g)a|8=~3j@*Ak0uoWO9BGHfU4$0rH4sKqYhdDa3>6v0AL@(R|pgVzDMve zL&Rf^5El_*Z+|ljV{Wk;fmKaIb^?TJ0M-kj#{O&Z`hwD@F#SP5E~NrE^cygju}r{W zpAHPyLYD!M!%W}lc6+QO5m=mKyzGQn;%U#@oPae#lyg83F1z1G$m+**-UAK*+DOnO z0lXA|WfF3KX^#o6*{=u)!(i1`7z7^GCSkq$udK)Jtr@MY|D_)?M+#p^_;D`)0000< KMNUMnLSTZtfv__G delta 432 zcmV;h0Z;y}1HJ>07=Hu<00013M{Ml?001yhOjJdb?#2KA|K{%A&ECDe&7`EggOsdl zdy86XYEn{CNz{TD`ByDd<0=73$p!88a;eSF*yzJl$^uNxxJ2SgN z)TzTp{s)GAA)JHYT!^pvfewC0IDVf8S|`=gf8y)dCTa&USAR40ZndJ2=^=OLoA()o z%#_1`4A_42z+6CEiipNci+pMXg+$DhGI+@IY52?nkx&Gy-6iavBU;@0WkrXX$FYKr-$!=p1Fp3N@oGblSAML0M3e)PV68V zKN{d(QDz4cuJ@otRHjy-+y#JY_0lj-Z5^b-I{>^?r?a@Q0>sV*x;KdHxUdfSip^Ws z9~h8rG8>p+a~T8*u`Eh$`|t*OrS2(o)8a#GTa#)ooGDVFmscjX9>0@ptULTI!=J5F aM~EMRRB6?|)p7s;0000c0004VQb$4nuFf3k0000mP)t-sapl)aV>+e1 zga7~ldyHC?rE9&`oM>=RQc_CD;Hdcc`2YX^*3QMfy|rj?NB{r;D`h`t0004rNkl_T4uQ zP+IXDy}BQlW#AbLCk_xi4GCJMFrA`3Vkr&eDWSv_3_vc#c?>l%MhMeF>~ zL3`0WggkiWfNgh;BU%=swv?|Bmv!iKVFieJ(%8L(d3GU}#o)MGaF}OVUw#~SOCG2P zLR+x!dgMQkgx7m80Fa+SaeO;D3Bogh?*~CnK%c$11e`Pj;!4v$pQNB~fpdc13&JZU14v^wJVCH5j9j00000NkvXXu0mjfm}lPf delta 390 zcmV;10eSw51eF7j7=Hu<00013M{Ml?001yhOjJdb?#2KA|K{%A&ECDe&7`EggOsdl zdy86XYEn{CNO&0GywW8Gmzuy!LyVna@gu*w{$% zl?q!S@+y&MItq{&k*QW(RANM@UWbcHjOYL=DUZ+WhEh&E{$N^AZ^!qfAl1tQBgmB} zM(EdE56p^Q>W?XQ$Q13hi$ZaOmTA#BjAtrunE_c@Ae0Ik?j>VO4-=I`@~NUwEW&#zJ_-gAPMlDU0JZhaL69wauz<#R#4g`aSN3KE zQ{yC@_oQIs2DFISobUb$A%vK(!Yv_;OT$$lzLold=>Px# diff --git a/graphics/battle_anims/sprites/substitute_back_new.png b/graphics/battle_anims/sprites/substitute_back_new.png deleted file mode 100644 index fd31e1063caf280c84d463508e0c1ee028eb5938..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ip*S9h%6&(>C9u5n3GyugW zEXc?x2>9{i$B73kG73C^B52@Euk1>o5NCl$WHAGSPzeY#-b<6OU|?X3^K@|x@#uUz z*)Z?00go%MqxgaxaoOa^7kS1vSI@9@NZe9AEpFlS7rolIJ$*Whn6_m9JLUdq@}jOs z3-^1zeaDbnuU`3Lo43zNu8*a{9~74fZm<4P6wlM~d#%taMsHoVrcY)jH~7SF>MZ1) z*1_IT*nA<^{5az)hbJ~Y3lCIxgu5T8U3TPlVhmTvlhb$1+VVP?EtpDXYTDaB&}rHr z#CU)+Oft|h@^qtHh{Oex>m>%8TKOZd*Ib{HBzUAz!Eo8PHs&<-Web$`13D`no;}N# z=pQe$VDSfm%90z))wZNIFjnps)6Hj0X3BV@G_UcnFdGDVb26|s3A`;~0?KiGo z@XTyMWqWnQ#;|#N){gA(x7-Z9)eEflN zLzHw3gD~U8X<`a;!Fvr7>V&&=Mf&Ck3-8+=u|#>-KCz`Q#Vzo7sC diff --git a/graphics/battle_anims/sprites/substitute_new.png b/graphics/battle_anims/sprites/substitute_new.png deleted file mode 100644 index 5d563900c0683c2066d33b91a3b91e9ecaf7beec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ip*S9h%6&(>C9u5n3GyugW zEXc?x2>9{i$B73kG73C^B52@Euk1>o5NCl$WHAGSPzeY#-b<6OU|?XB@^oU=pfk2BWuYSP;pP;4<>RSq~`FJG-?_gas)5cxu>x!Mn&q+@9Tdrh!`l_ufnvJL4`}iZU$Y)F@{NbT|_CNjvF5M6$YQ&8GXj;Zv-#{Eipv zmajRmsyTo$z=rYR0?EMWgoz9{vJ@vSSXVC{m6&Q~Uz`27!7TcS&GAOH5|?hxBQ4Pm z?`L1=;$(|{pU<;kOX80Y_Y&GIxRzhI_glVBhnw>N`!`mH>-qc#LYNk0r!-W!uvYRs zxc={1^@HwHjHf&p&XlPno$(XszVP9dThy_ey95=!rD_!j`}PZS6Q6I)leot{-Z{f};X$JO_@w!Rd<``s%+&@1>VC^S7?{an^LB{Ts5EJUSX diff --git a/include/graphics.h b/include/graphics.h index dd8f57b753..87635d43a1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9322,9 +9322,9 @@ extern const u32 gConfetti_Gfx[]; extern const u32 gConfetti_Pal[]; extern const u32 gBattleInterfaceGfx_BattleBar[]; -extern const u32 gSubstituteDollBackGfx[]; -extern const u32 gSubstituteDollFrontGfx[]; -extern const u32 gSubstituteDollPal[]; +extern const u32 gBattleAnimSpriteGfx_Substitute[]; +extern const u32 gBattleAnimSpriteGfx_SubstituteBack[]; +extern const u32 gBattleAnimSpritePal_Substitute[]; extern const u32 gHealthboxSinglesPlayerGfx[]; extern const u32 gHealthboxSinglesOpponentGfx[]; extern const u32 gHealthboxDoublesPlayerGfx[]; @@ -10145,9 +10145,6 @@ extern const u32 gBattleAnimSpritePal_StonePillar[]; extern const u32 gBattleAnimSpriteGfx_StraightBeam[]; extern const u32 gBattleAnimSpritePal_StraightBeam[]; extern const u32 gBattleAnimSpritePal_Poltergeist[]; -extern const u32 gBattleAnimSpriteGfx_SubstituteBack[]; -extern const u32 gBattleAnimSpriteGfx_SubstituteFront[]; -extern const u32 gBattleAnimSpritePal_SubstituteFront[]; extern const u32 gBattleAnimSpritePal_NewSurf[]; extern const u32 gBattleAnimSpriteGfx_NewSword[]; extern const u32 gBattleAnimSpritePal_NewSword[]; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 3b8df10ac3..3bcbe3ae5f 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -955,17 +955,18 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite) if (!loadMonSprite) { + if (IsContest()) position = B_POSITION_PLAYER_LEFT; else position = GetBattlerPosition(battler); if (IsContest()) - LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gBattleAnimSpriteGfx_SubstituteBack, gMonSpritesGfxPtr->sprites.ptr[position]); else if (GetBattlerSide(battler) != B_SIDE_PLAYER) - LZDecompressVram(gSubstituteDollFrontGfx, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gBattleAnimSpriteGfx_Substitute, gMonSpritesGfxPtr->sprites.ptr[position]); else - LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gBattleAnimSpriteGfx_SubstituteBack, gMonSpritesGfxPtr->sprites.ptr[position]); for (i = 1; i < 4; i++) { @@ -973,7 +974,7 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite) } palOffset = OBJ_PLTT_ID(battler); - LoadCompressedPalette(gSubstituteDollPal, palOffset, PLTT_SIZE_4BPP); + LoadCompressedPalette(gBattleAnimSpritePal_Substitute, palOffset, PLTT_SIZE_4BPP); } else { diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index 0a3c5d6475..885038725c 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -1156,11 +1156,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_Shock2, 0x0600, ANIM_TAG_SHOCK_2}, {gBattleAnimSpriteGfx_ClosingEye2, 0x0200, ANIM_TAG_CLOSING_EYE_2}, {gBattleAnimSpriteGfx_MetalBall, 0x0080, ANIM_TAG_METAL_BALL}, -#if NEW_SUBSTITUTE_PARTICLE - {gBattleAnimSpriteGfx_NewSubstituteFront, 0x0200, ANIM_TAG_MONSTER_DOLL}, -#else {gBattleAnimSpriteGfx_MonsterDoll, 0x0200, ANIM_TAG_MONSTER_DOLL}, -#endif {gBattleAnimSpriteGfx_Whirlwind, 0x0800, ANIM_TAG_WHIRLWIND}, {gBattleAnimSpriteGfx_Whirlwind2, 0x0080, ANIM_TAG_WHIRLWIND_2}, {gBattleAnimSpriteGfx_Explosion4, 0x0a00, ANIM_TAG_EXPLOSION_4}, @@ -1607,11 +1603,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_Shock2, ANIM_TAG_SHOCK_2}, {gBattleAnimSpritePal_ClosingEye2, ANIM_TAG_CLOSING_EYE_2}, {gBattleAnimSpritePal_MetalBall, ANIM_TAG_METAL_BALL}, -#if NEW_SUBSTITUTE_PARTICLE - {gBattleAnimSpritePal_NewSubstituteFront, ANIM_TAG_MONSTER_DOLL}, -#else {gBattleAnimSpritePal_MonsterDoll, ANIM_TAG_MONSTER_DOLL}, -#endif {gBattleAnimSpritePal_Whirlwind, ANIM_TAG_WHIRLWIND}, {gBattleAnimSpritePal_Whirlwind, ANIM_TAG_WHIRLWIND_2}, {gBattleAnimSpritePal_Explosion4, ANIM_TAG_EXPLOSION_4}, diff --git a/src/graphics.c b/src/graphics.c index e7b93e9e92..40c5d131b4 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -265,10 +265,6 @@ const u32 gBattleAnimSpritePal_SteelBeam[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_StraightBeam[] = INCBIN_U32("graphics/battle_anims/sprites/straight_beam.4bpp.lz"); const u32 gBattleAnimSpritePal_StraightBeam[] = INCBIN_U32("graphics/battle_anims/sprites/straight_beam.gbapal.lz"); -const u32 gBattleAnimSpriteGfx_SubstituteBack[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_back_new.4bpp.lz"); -const u32 gBattleAnimSpriteGfx_NewSubstituteFront[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_new.4bpp.lz"); -const u32 gBattleAnimSpritePal_NewSubstituteFront[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_new.gbapal.lz"); - const u32 gBattleAnimSpritePal_NewSurf[] = INCBIN_U32("graphics/battle_anims/sprites/surf_new.gbapal.lz"); const u32 gBattleAnimSpriteGfx_NewSword[] = INCBIN_U32("graphics/battle_anims/sprites/sword_new.4bpp.lz"); @@ -1174,9 +1170,9 @@ const u32 gBattleAnimSpritePal_HandsAndFeet[] = INCBIN_U32("graphics/battle_anim const u32 gBattleAnimSpriteGfx_Confetti[] = INCBIN_U32("graphics/battle_anims/sprites/confetti.4bpp.lz"); const u32 gBattleAnimSpritePal_Confetti[] = INCBIN_U32("graphics/battle_anims/sprites/confetti.gbapal.lz"); -const u32 gSubstituteDollPal[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.gbapal.lz"); -const u32 gSubstituteDollFrontGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz"); -const u32 gSubstituteDollBackGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_back.4bpp.lz"); +const u32 gBattleAnimSpriteGfx_Substitute[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz"); +const u32 gBattleAnimSpriteGfx_SubstituteBack[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_back.4bpp.lz"); +const u32 gBattleAnimSpritePal_Substitute[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.gbapal.lz"); const u32 gBattleAnimSpriteGfx_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.4bpp.lz"); const u32 gBattleAnimSpritePal_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.gbapal.lz");