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

Added the Gen. 4+ berries to gBerryCrush_BerryData #5937

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

LOuroboros
Copy link
Collaborator

@LOuroboros LOuroboros commented Jan 2, 2025

Description

This PR adds the missing Gen. 4 berries' data to the gBerryCrush_BerryData array.
I picked the values somewhat randomly based on each berry's parameters at gBerries and then picking the closest to each berry that was already present in gBerryCrush_BerryData. For the Gen. 4+ Enigma Berry I just copy-pasted the Gen. 3 one though.

Issue(s) that this PR fixes

Fixes #5935

Discord contact info

lunos#4026

@LOuroboros
Copy link
Collaborator Author

In regular Lunos fashion I confused the Berry Blender with the Berry Crush.

Still, I'll leave this PR opened for now and test if it does fix the Berry Crush.

@fakuzatsu
Copy link

Yeah, that should do it. Same change I made in my repo I'm just not able to fork expansion rn. Still worth a test I suppose.

@LOuroboros
Copy link
Collaborator Author

It kinda sort of works.

I honestly can't tell if the freeze was a VBA thing or a game thing.

berryCrushed.mp4

@fakuzatsu
Copy link

It's possible it crashed on the participant game due to an issue in tabulating the block sent by the leader... (

)
or just inaccurate emulator things(tm).

I'll take a look when I get home.

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.

gBerryCrush_BerryData doesn't contain Expansion Berries
2 participants