ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Poké Ball shortcut tweaks (#3254)

Browse Source
This commit is contained in:
voloved 2023-08-26 12:58:51 -04:00 committed by GitHub
parent 76075ffe57
commit 2784f701d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_controller_player.c
View File

@ -326,7 +326,7 @@ static void HandleInputChooseAction(void)
SwapBallToDisplay(sameBall); SwapBallToDisplay(sameBall);
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
} }
else if (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped) else if (JOY_NEW(B_BUTTON) || (!JOY_HELD(B_LAST_USED_BALL_BUTTON) && sBallSwapped))
{ {
sAckBallUseBtn = FALSE; sAckBallUseBtn = FALSE;
sBallSwapped = FALSE; sBallSwapped = FALSE;

8
src/battle_interface.c
View File

@ -3256,13 +3256,13 @@ static const struct SpriteSheet sSpriteSheet_LastUsedBallWindow =
sLastUsedBallWindowGfx, sizeof(sLastUsedBallWindowGfx), LAST_BALL_WINDOW_TAG sLastUsedBallWindowGfx, sizeof(sLastUsedBallWindowGfx), LAST_BALL_WINDOW_TAG
}; };
#define LAST_USED_BALL_X_F 15 #define LAST_USED_BALL_X_F 14
#define LAST_USED_BALL_X_0 -15 #define LAST_USED_BALL_X_0 -14
#define LAST_USED_BALL_Y ((IsDoubleBattle()) ? 78 : 68) #define LAST_USED_BALL_Y ((IsDoubleBattle()) ? 78 : 68)
#define LAST_USED_BALL_Y_BNC ((IsDoubleBattle()) ? 76 : 66) #define LAST_USED_BALL_Y_BNC ((IsDoubleBattle()) ? 76 : 66)
#define LAST_BALL_WIN_X_F (LAST_USED_BALL_X_F - 1) #define LAST_BALL_WIN_X_F (LAST_USED_BALL_X_F - 0)
#define LAST_BALL_WIN_X_0 (LAST_USED_BALL_X_0 - 1) #define LAST_BALL_WIN_X_0 (LAST_USED_BALL_X_0 - 0)
#define LAST_USED_WIN_Y (LAST_USED_BALL_Y - 8) #define LAST_USED_WIN_Y (LAST_USED_BALL_Y - 8)
#define sHide data[0] #define sHide data[0]