diff --git a/data/v2/build.py b/data/v2/build.py
index 93cb69711..b641f9bc7 100644
--- a/data/v2/build.py
+++ b/data/v2/build.py
@@ -1003,15 +1003,15 @@ def csv_record_to_objects(info):
         yield Berry(
             id=int(info[0]),
             item_id=int(info[1]),
-            name=item.name[: item.name.index("-")],
-            berry_firmness_id=int(info[2]),
-            natural_gift_power=int(info[3]),
-            natural_gift_type_id=int(info[4]),
-            size=int(info[5]),
-            max_harvest=int(info[6]),
-            growth_time=int(info[7]),
-            soil_dryness=int(info[8]),
-            smoothness=int(info[9]),
+            name=item.name.split("-berry")[0],
+            berry_firmness_id=int(info[2]) if info[2] else None,
+            natural_gift_power=int(info[3]) if info[3] else None,
+            natural_gift_type_id=int(info[4]) if info[4] else None,
+            size=int(info[5]) if info[5] else None,
+            max_harvest=int(info[6]) if info[6] else None,
+            growth_time=int(info[7]) if info[7] else None,
+            soil_dryness=int(info[8]) if info[8] else None,
+            smoothness=int(info[9]) if info[9] else None,
         )
 
     build_generic((Berry,), "berries.csv", csv_record_to_objects)
diff --git a/data/v2/csv/berries.csv b/data/v2/csv/berries.csv
index 5fdbd6528..f7ac3b7ec 100644
--- a/data/v2/csv/berries.csv
+++ b/data/v2/csv/berries.csv
@@ -63,3 +63,7 @@ id,item_id,firmness_id,natural_gift_power,natural_gift_type_id,size,max_harvest,
 62,187,5,80,8,267,5,24,7,60
 63,188,2,80,16,33,5,24,7,60
 64,189,1,80,17,52,5,24,7,60
+65,724,,100,18,,8,72,,
+66,725,,100,17,,8,72,,
+67,2278,,17,,,,,,
+68,2279,,,,,,,,
\ No newline at end of file
diff --git a/data/v2/csv/items.csv b/data/v2/csv/items.csv
index 139a73620..133b89638 100644
--- a/data/v2/csv/items.csv
+++ b/data/v2/csv/items.csv
@@ -2220,3 +2220,5 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 2275,baxcalibrite,44,0,80,
 2276,tatsugirinite,44,0,80,
 2277,glimmoranite,44,0,80,
+2278,hopo-berry,28,300,,
+2279,roseli-berry,7,200,10,
diff --git a/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py b/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py
new file mode 100644
index 000000000..ebd3564ca
--- /dev/null
+++ b/pokemon_v2/migrations/0030_alter_berry_growth_time_alter_berry_max_harvest_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 5.2.10 on 2026-06-25 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pokemon_v2", "0029_pokemonformtrigger_pokemonformcondition"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="berry",
+            name="growth_time",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="berry",
+            name="max_harvest",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="berry",
+            name="natural_gift_power",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="berry",
+            name="size",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="berry",
+            name="smoothness",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="berry",
+            name="soil_dryness",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+    ]