From c911d4bf57ecc4aad6cc9f366ff750df58ce4951 Mon Sep 17 00:00:00 2001 From: voloved <36523934+voloved@users.noreply.github.com> Date: Wed, 21 Jun 2023 13:19:08 -0400 Subject: [PATCH] Made window's starting location track with ball; made window show if it's showing on startup (#3042) --- src/battle_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 518bad2c94..35f4413a89 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -3258,7 +3258,7 @@ static const struct SpriteSheet sSpriteSheet_LastUsedBallWindow = #define LAST_USED_BALL_Y ((IsDoubleBattle()) ? 78 : 68) #define LAST_BALL_WIN_X_F (LAST_USED_BALL_X_F - 1) -#define LAST_BALL_WIN_X_0 (LAST_USED_BALL_X_0 - 0) +#define LAST_BALL_WIN_X_0 (LAST_USED_BALL_X_0 - 1) #define LAST_USED_WIN_Y (LAST_USED_BALL_Y - 8) #define sHide data[0] @@ -3314,7 +3314,7 @@ void TryAddLastUsedBallItemSprites(void) gBattleStruct->ballSpriteIds[1] = CreateSprite(&sSpriteTemplate_LastUsedBallWindow, LAST_BALL_WIN_X_0, LAST_USED_WIN_Y, 5); - gSprites[gBattleStruct->ballSpriteIds[0]].sHide = FALSE; // restore + gSprites[gBattleStruct->ballSpriteIds[1]].sHide = FALSE; // restore } #endif }