diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-04 12:50:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 12:50:55 -0500 |
| commit | bec799ef723b4832b5022051ce9108e39f3744dc (patch) | |
| tree | 6b45fe2707fb3ab10697133e0542c1bc2e21bf4c | |
| parent | dbccb759ba34fedce68a8e4aec2b155d512cc848 (diff) | |
| parent | e0c0143f4191cb05e3e70af32df0f3eb6b0e3675 (diff) | |
Merge pull request #1288 from GriffinRichards/substitute
Fix substitute back sprite
| -rw-r--r-- | graphics/battle_anims/sprites/substitute.bin | bin | 2048 -> 0 bytes | |||
| -rw-r--r-- | graphics/battle_anims/sprites/substitute_back.png | bin | 0 -> 405 bytes | |||
| -rw-r--r-- | include/graphics.h | 4 | ||||
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 6 | ||||
| -rw-r--r-- | src/graphics.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin Binary files differdeleted file mode 100644 index d30c07d4e..000000000 --- a/graphics/battle_anims/sprites/substitute.bin +++ /dev/null diff --git a/graphics/battle_anims/sprites/substitute_back.png b/graphics/battle_anims/sprites/substitute_back.png Binary files differnew file mode 100644 index 000000000..8ea1f7ff8 --- /dev/null +++ b/graphics/battle_anims/sprites/substitute_back.png 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"); |
