dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync berry crush from Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-05-05 13:03:39 -04:00
parent 9ed87063f1
commit ee6b3c1acf
46 changed files with 1776 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry.c
+44 -44
View File
@@ -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