diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-27 06:46:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 06:46:29 -0400 |
| commit | c396aaa804543c6950bdef918f3773394da09bdf (patch) | |
| tree | a925bd32e0745ddf3ecef23d1ef3e710f3250273 /src/berry.c | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/berry.c b/src/berry.c index c5b8af7f8..680f21e3d 100644 --- a/src/berry.c +++ b/src/berry.c @@ -867,50 +867,50 @@ const struct Berry gBerries[] = { }; -const struct BerryCrushStats gBerryCrushStats[] = { - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - {100, 100}, - {100, 100}, - {100, 100}, - {100, 100}, - {100, 100}, - {130, 150}, - {130, 150}, - {130, 150}, - {130, 150}, - {130, 150}, - {160, 250}, - {160, 250}, - {160, 250}, - {160, 250}, - {160, 250}, - {180, 500}, - {180, 500}, - {180, 500}, - {180, 500}, - {180, 500}, - {200, 750}, - {200, 750}, - {150, 200} +const struct BerryCrushStats gBerryCrush_BerryData[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = {200, 750}, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = {200, 750}, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = {150, 200} }; // Leftover from R/S |