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

Implemented Lures and Repel/Lure "use another" menu #2319

Merged
merged 10 commits into from
Nov 2, 2022

Conversation

AsparagusEduardo
Copy link
Collaborator

Description

  • Implemented Lures by using a mask to reuse VAR_REPEL_STEP_COUNT.
    • Increases shiny chances. (Reworked shiny rerolls to support further additional rolls)
    • Increased chances of rarer Pokémon appearing by inverting the table encounter slot chances 20% of the time (credit CitrusBolt and Jaizu).
    • Increased encounter rate.
    • Encountered Wild Pokémon will have the highest possible level + 1.
  • Implemented 4 configurations for the Repel/Lure prompt, togglable between them in include/item_config.h:
    • I_REPEL_LURE_MENU set to FALSE:
      • 1A VAR_LAST_REPEL_LURE_USED not assigned: RSE to BW behavior.
      • 1B VAR_LAST_REPEL_LURE_USED assigned: B2W2+ behavior.
    • I_REPEL_LURE_MENU set to TRUE:
      • 2A VAR_LAST_REPEL_LURE_USED not assigned: Opens a menus that lets the player choose between the repel/lure types they have left. If they only have one, it defaults to behavior 1B.
      • 2BVAR_LAST_REPEL_LURE_USED assigned: Same as 2A but the cursor for the menu automatically points to the last used item.

Repel menu based off @DizzyEggg's

Discord contact info

AsparagusEduardo#6051

@AsparagusEduardo AsparagusEduardo changed the base branch from master to dev September 14, 2022 11:05
@AsparagusEduardo AsparagusEduardo added new-feature Adds a feature category: items Pertains to items labels Sep 16, 2022
Copy link

@Jaizu Jaizu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing spaces 👀
Edit: in wild_encounter.c

@AsparagusEduardo AsparagusEduardo changed the base branch from dev to dev_1.x September 16, 2022 17:29
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
src/wild_encounter.c Outdated Show resolved Hide resolved
@ghoulslash ghoulslash merged commit c6cb54b into rh-hideout:upcoming Nov 2, 2022
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/Lures branch November 3, 2022 13:28
@AsparagusEduardo AsparagusEduardo mentioned this pull request Nov 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: items Pertains to items new-feature Adds a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants