Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Cycling Through Balls in the Last Ball Used Menu #3039

Merged
merged 10 commits into from
Aug 24, 2023

Conversation

voloved
Copy link

@voloved voloved commented May 31, 2023

This PR is the same as #3034, but is pointing to the correct branch of the contributor's repo.
Context in the Discord: https://discord.com/channels/419213663107416084/419214240277200898/1112508362375041107

Description

Allows cycling through the balls in your inventory.
It's off by default. Setting B_LAST_USED_BALL_CYCLE to TRUE will allow it to work (assuming B_LAST_USED_BALL also is set to TRUE).
Toggling is done by holding the B_LAST_USED_BALL_BUTTON and clicking the D-Pad. Up and Left go to the previous ball in your bag and Down and Right go to the next ball. It wraps around, so if I choose the previous ball and am looking at the first slot's ball, it'll cycle to the last slot.
Throwing the ball now goes off when the B_LAST_USED_BALL_BUTTON is released. If that button is held and the user wants to cancel throwing a ball, they can press B_LAST_USED_BTN_CANCEL_CYC before letting go.
Having B_LAST_USED_BALL_CYCLE set to FALSE has everything behave the same as before this PR.

Images

cycleball

Discord contact info

devolov#4853

…indow is present to avoid overwriting other palettes
@DizzyEggg
Copy link
Collaborator

Conflicts 👀

@voloved
Copy link
Author

voloved commented Jul 3, 2023

Conflicts 👀

That was due to a bugfix being made in #3042 that was not added here in case #3042 wasn't going to be picked up.
Upcoming branch has been merged and the conflict has been resolved.

src/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle_interface.c Outdated Show resolved Hide resolved
src/battle_interface.c Outdated Show resolved Hide resolved
include/config/battle.h Outdated Show resolved Hide resolved
include/config/battle.h Outdated Show resolved Hide resolved
src/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle_interface.c Show resolved Hide resolved
@AsparagusEduardo AsparagusEduardo self-assigned this Aug 12, 2023
@AsparagusEduardo AsparagusEduardo merged commit 2a2cd77 into rh-hideout:upcoming Aug 24, 2023
1 check passed
@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants