From e0c0143f4191cb05e3e70af32df0f3eb6b0e3675 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 4 Jan 2021 10:14:01 -0500
Subject: [PATCH] Fix substitute back sprite

---
 graphics/battle_anims/sprites/substitute.bin     | Bin 2048 -> 0 bytes
 .../battle_anims/sprites/substitute_back.png     | Bin 0 -> 405 bytes
 include/graphics.h                               |   4 ++--
 src/battle_gfx_sfx_util.c                        |   6 +++---
 src/graphics.c                                   |   4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 graphics/battle_anims/sprites/substitute.bin
 create mode 100644 graphics/battle_anims/sprites/substitute_back.png

diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin
deleted file mode 100644
index d30c07d4ef1f4e153b5af07e41aa7135451b85d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmeH_zfQw25XNtTBxCyquyuun2Pmval`ahr;A=9XO1Wg~ViLA6B$nS3G4nYhRfkSU
z{26l6&wuV5JKtv$%`rRhBMuy}Yk(-mzycFfW?tG%WJsAgKnYPd07>Y{3_ud*^(FKB
zBeVG!zdzF`a_i_!;rCMq92v+@$dF0{LE|y(mTk4=N>lDtQm#c%GhcPfwyn5-Q#Q3T
z(j)?(9`;1{poLb2R}P1u8>7<T!e7Uzlc6=-a1X*5<N`|WMQkNfsfg}GYA_TcPP8nf
z#7qWoj8av0u5QX&Rl#!cOjnzTJl;^yeE~M4ly!?JTP^>=3&@@KzJMg@&=C0=zt~N;
zf)tcbKpnzE7j@o;H4gJrpt(`^+G5YK-mGq-<~p#a_SVuJ$K<C6FdZ`Yvjg9B;1l9)
Bgy;YO

diff --git a/graphics/battle_anims/sprites/substitute_back.png b/graphics/battle_anims/sprites/substitute_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea1f7ff8b772930f3f5b27d088f5b3c1d09e43f
GIT binary patch
literal 405
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ip*D3Fg{{R2~*}HpZ@9o`t
zcFB^x%~RH7Rd+{aWd#KVc{v(78cJ9K)xtsVrm4Re7#I~iT^vI^I^RyV^*dr9;1;X)
z^pe6U*0-D*I}UuyY1Cc5SRpyc(OK=C(!wK}7rmq(R~IqNncpW_+_>jk^{koay;^SE
z@c1~DD_ZfB*2Huxt_czoSBAxeB)Ke)Ywz~zdBLEi*?;~`Tacg4zl5lO{Nvx3C|o_w
ztbAgsy4#EEG5lw`;$HP@mYooJyS3Y?uz6bMMa!Oat^Apck&y~hxTM~xCVTS>Pj&vZ
za#4WJp}KNkuAtqK4Xc@N8eirUSKRW2m-SlrfvpqlxYz{!<^=RIZ2fxHae{8uhK6Gm
zNA&IohJQ<A34W|H=lha`$81|VZp?ZAk4v#-#`;6Liap+kLlySTs4+XE!}EPsmf)jG
w!Tz($b2J^FY);zWe&C-~<&1}qdVA}CvYzB>c4;hq91IFLPgg&ebxsLQ0I#U5`Tzg`

literal 0
HcmV?d00001

diff --git a/include/graphics.h b/include/graphics.h
index 5c15b7a66..d3d01bc57 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4087,8 +4087,8 @@ extern const u32 gConfetti_Gfx[];
 extern const u32 gConfetti_Pal[];
 
 extern const u32 gUnknown_08C093F0[];
-extern const u32 gSubstituteDollTilemap[];
-extern const u32 gSubstituteDollGfx[];
+extern const u32 gSubstituteDollBackGfx[];
+extern const u32 gSubstituteDollFrontGfx[];
 extern const u32 gSubstituteDollPal[];
 extern const u32 gHealthboxSinglesPlayerGfx[];
 extern const u32 gHealthboxSinglesOpponentGfx[];
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index c6db4ad42..77b91f1f4 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -997,11 +997,11 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite)
             position = GetBattlerPosition(battlerId);
 
         if (IsContest())
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites.ptr[position]);
+            LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]);
         else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
-            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites.ptr[position]);
+            LZDecompressVram(gSubstituteDollFrontGfx, gMonSpritesGfxPtr->sprites.ptr[position]);
         else
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites.ptr[position]);
+            LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]);
 
         for (i = 1; i < 4; i++)
         {
diff --git a/src/graphics.c b/src/graphics.c
index 3973c1507..aa8d5c249 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -867,8 +867,8 @@ const u32 gBattleAnimSpriteGfx_Confetti[] = INCBIN_U32("graphics/battle_anims/sp
 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 gSubstituteDollGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz");
-const u32 gSubstituteDollTilemap[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.bin.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_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");