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

Pickup Table Refactor #3351

Merged
merged 8 commits into from
Sep 28, 2023
Merged

Conversation

kittenchilly
Copy link

@kittenchilly kittenchilly commented Sep 27, 2023

Description

Refactors the Pickup table to be more in line with modern gens.
Also switches to using SWSH pickup table data, since the SV table is the same except for removing repels.

Discord contact info

kittenchilly

@LOuroboros
Copy link
Collaborator

I don't think this PR is much of an update as is. At least not an "update to ORAS".

The image you shared from Bulbapedia shows that the modern games have 10 different tables for Pickup that represent different Pokémon level thresholds, which are not really present here.

DoesntKnowHowToPlay made an implementation for that in their old Pokeruby project.

I think that porting that over to the expansion would be a better way to go about updating Pickup, preferably with a preproc config to toggle between the vanilla and the Gen. 6 functionality.

@kittenchilly
Copy link
Author

I don't think this PR is much of an update as is. At least not an "update to ORAS".

The image you shared from Bulbapedia shows that the modern games have 10 different tables for Pickup that represent different Pokémon level thresholds, which are not really present here.

DoesntKnowHowToPlay made an implementation for that in their old Pokeruby project.

I think that porting that over to the expansion would be a better way to go about updating Pickup, preferably with a preproc config to toggle between the vanilla and the Gen. 6 functionality.

Bulbapedia says Emerald uses the same level thresholds. If we haven't changed it from decomp it should work exactly the same and we only need to change what items it gives.

@LOuroboros
Copy link
Collaborator

I don't think this PR is much of an update as is. At least not an "update to ORAS".
The image you shared from Bulbapedia shows that the modern games have 10 different tables for Pickup that represent different Pokémon level thresholds, which are not really present here.
DoesntKnowHowToPlay made an implementation for that in their old Pokeruby project.
I think that porting that over to the expansion would be a better way to go about updating Pickup, preferably with a preproc config to toggle between the vanilla and the Gen. 6 functionality.

Bulbapedia says Emerald uses the same level thresholds. If we haven't changed it from decomp it should work exactly the same and we only need to change what items it gives.

I think I misinterpreted how the data is shown there, sorry, my bad. Carry on 👀

@AsparagusEduardo
Copy link
Collaborator

I would prefer a refactor that makes the tables easier to edit instead of just changing the items.

@kittenchilly
Copy link
Author

I'm going to set this to a draft since this PR seems to require more than I thought, especially in regards to pickup's in battle effect.

@kittenchilly kittenchilly marked this pull request as draft September 27, 2023 19:00
@kittenchilly kittenchilly changed the title Update Pickup table to ORAS Pickup Table Refactor Sep 27, 2023
@kittenchilly kittenchilly marked this pull request as ready for review September 27, 2023 22:04
@kittenchilly
Copy link
Author

Ready to review.

@AsparagusEduardo AsparagusEduardo merged commit 9f1dbee into rh-hideout:upcoming Sep 28, 2023
1 check passed
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