Merge berry tree frames

214 files changed, 34 insertions, 185 deletions

diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/event_objects/pics/berry_trees/aguav.png
new file mode 100644
index 000000000..13321eb42
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/aguav.png
diff --git a/graphics/event_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png
deleted file mode 100644
index 0463d51db..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png
deleted file mode 100644
index a5f4b8bee..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png
deleted file mode 100644
index 7af57fd97..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png
deleted file mode 100644
index 0fdd3f994..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png
deleted file mode 100644
index f3fc70076..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png
deleted file mode 100644
index b437940bf..000000000
--- a/graphics/event_objects/pics/berry_trees/aguav/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/event_objects/pics/berry_trees/aspear.png
new file mode 100644
index 000000000..984e598ea
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/aspear.png
diff --git a/graphics/event_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png
deleted file mode 100644
index 933957413..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png
deleted file mode 100644
index ee750e7f3..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png
deleted file mode 100644
index e3a4e47bb..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png
deleted file mode 100644
index df16ae330..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png
deleted file mode 100644
index 8d9bd38fb..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png
deleted file mode 100644
index 495119480..000000000
--- a/graphics/event_objects/pics/berry_trees/aspear/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/event_objects/pics/berry_trees/cheri.png
new file mode 100644
index 000000000..527ef9dfe
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/cheri.png
diff --git a/graphics/event_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png
deleted file mode 100644
index 18588dc6c..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png
deleted file mode 100644
index e9419d0fe..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png
deleted file mode 100644
index 4022a7e5e..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png
deleted file mode 100644
index c2572383c..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png
deleted file mode 100644
index 462596c51..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png
deleted file mode 100644
index 447f1d865..000000000
--- a/graphics/event_objects/pics/berry_trees/cheri/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/event_objects/pics/berry_trees/chesto.png
new file mode 100644
index 000000000..36b4520ce
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/chesto.png
diff --git a/graphics/event_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png
deleted file mode 100644
index 516a334c1..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png
deleted file mode 100644
index dacc90fb3..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png
deleted file mode 100644
index c0a2ec30d..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png
deleted file mode 100644
index 328fee834..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png
deleted file mode 100644
index d40a393a2..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png
deleted file mode 100644
index 3d3d03d64..000000000
--- a/graphics/event_objects/pics/berry_trees/chesto/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/event_objects/pics/berry_trees/cornn.png
new file mode 100644
index 000000000..60ac7da8b
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/cornn.png
diff --git a/graphics/event_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png
deleted file mode 100644
index 8388b030c..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png
deleted file mode 100644
index 23d529796..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png
deleted file mode 100644
index 969020d39..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png
deleted file mode 100644
index 88d136547..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png
deleted file mode 100644
index c50789645..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png
deleted file mode 100644
index de7b7f4ad..000000000
--- a/graphics/event_objects/pics/berry_trees/cornn/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/event_objects/pics/berry_trees/durin.png
new file mode 100644
index 000000000..250cea031
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/durin.png
diff --git a/graphics/event_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png
deleted file mode 100644
index eefe4ba78..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png
deleted file mode 100644
index d5b75b3b3..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png
deleted file mode 100644
index cf854194d..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png
deleted file mode 100644
index 41425502f..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png
deleted file mode 100644
index 66337024c..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png
deleted file mode 100644
index 22c672fac..000000000
--- a/graphics/event_objects/pics/berry_trees/durin/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/event_objects/pics/berry_trees/figy.png
new file mode 100644
index 000000000..2f26d1381
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/figy.png
diff --git a/graphics/event_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png
deleted file mode 100644
index 0eea8f98c..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png
deleted file mode 100644
index 018e0ae3f..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png
deleted file mode 100644
index df10bb526..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png
deleted file mode 100644
index bf1785f87..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png
deleted file mode 100644
index 46d794635..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png
deleted file mode 100644
index 945773fda..000000000
--- a/graphics/event_objects/pics/berry_trees/figy/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/event_objects/pics/berry_trees/grepa.png
new file mode 100644
index 000000000..07c8554ce
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/grepa.png
diff --git a/graphics/event_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png
deleted file mode 100644
index abd265e0b..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png
deleted file mode 100644
index 27e90c9bd..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png
deleted file mode 100644
index 22e354eb0..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png
deleted file mode 100644
index e23824dd3..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png
deleted file mode 100644
index 4b8ad19a0..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png
deleted file mode 100644
index 9bf54a3e0..000000000
--- a/graphics/event_objects/pics/berry_trees/grepa/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/event_objects/pics/berry_trees/hondew.png
new file mode 100644
index 000000000..45f5605ee
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/hondew.png
diff --git a/graphics/event_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png
deleted file mode 100644
index ab1cffe55..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png
deleted file mode 100644
index e24fd5b95..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png
deleted file mode 100644
index dc7938958..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png
deleted file mode 100644
index 5c9536e87..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png
deleted file mode 100644
index 2419d058b..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png
deleted file mode 100644
index 76aa9a8e3..000000000
--- a/graphics/event_objects/pics/berry_trees/hondew/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/event_objects/pics/berry_trees/iapapa.png
new file mode 100644
index 000000000..2a8d9b760
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/iapapa.png
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png
deleted file mode 100644
index 506c8bb4b..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png
deleted file mode 100644
index 6eae7f4ba..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png
deleted file mode 100644
index d779ca7fb..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png
deleted file mode 100644
index 4bbd498e3..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png
deleted file mode 100644
index 36cde6254..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png
deleted file mode 100644
index b6a39d318..000000000
--- a/graphics/event_objects/pics/berry_trees/iapapa/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/event_objects/pics/berry_trees/kelpsy.png
new file mode 100644
index 000000000..bad257fce
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/kelpsy.png
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
deleted file mode 100644
index bb794552a..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
deleted file mode 100644
index 90257b261..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
deleted file mode 100644
index 2f3fec1ec..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
deleted file mode 100644
index 2efd0d160..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
deleted file mode 100644
index cf0c47d0a..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
deleted file mode 100644
index e31dfd23f..000000000
--- a/graphics/event_objects/pics/berry_trees/kelpsy/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/event_objects/pics/berry_trees/lansat.png
new file mode 100644
index 000000000..8ab63c979
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/lansat.png
diff --git a/graphics/event_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png
deleted file mode 100644
index 56d59b0a7..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png
deleted file mode 100644
index 59e7edcfa..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png
deleted file mode 100644
index f4d1145ef..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png
deleted file mode 100644
index 32ca5e3e9..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png
deleted file mode 100644
index bf285b8ee..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png
deleted file mode 100644
index 3a8dae404..000000000
--- a/graphics/event_objects/pics/berry_trees/lansat/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/event_objects/pics/berry_trees/leppa.png
new file mode 100644
index 000000000..a0b3dccc0
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/leppa.png
diff --git a/graphics/event_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png
deleted file mode 100644
index cecd61e2d..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png
deleted file mode 100644
index f3ce88199..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png
deleted file mode 100644
index d00cf5f89..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png
deleted file mode 100644
index 8a9ed3c34..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png
deleted file mode 100644
index dd4fc6df2..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png
deleted file mode 100644
index 056518295..000000000
--- a/graphics/event_objects/pics/berry_trees/leppa/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/event_objects/pics/berry_trees/liechi.png
new file mode 100644
index 000000000..a845c5ac2
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/liechi.png
diff --git a/graphics/event_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png
deleted file mode 100644
index 51827869f..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png
deleted file mode 100644
index 182400260..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png
deleted file mode 100644
index a24565623..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png
deleted file mode 100644
index b7bde2e7f..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png
deleted file mode 100644
index 2ed774c17..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png
deleted file mode 100644
index d8fe39b21..000000000
--- a/graphics/event_objects/pics/berry_trees/liechi/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/event_objects/pics/berry_trees/lum.png
new file mode 100644
index 000000000..e108e428f
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/lum.png
diff --git a/graphics/event_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png
deleted file mode 100644
index 4c08ea797..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png
deleted file mode 100644
index b2035c555..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png
deleted file mode 100644
index b09991fd9..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png
deleted file mode 100644
index e32e7b64a..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png
deleted file mode 100644
index 1347d66b2..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png
deleted file mode 100644
index 1c601d09b..000000000
--- a/graphics/event_objects/pics/berry_trees/lum/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/event_objects/pics/berry_trees/mago.png
new file mode 100644
index 000000000..cc30190d2
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/mago.png
diff --git a/graphics/event_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png
deleted file mode 100644
index b58d4aba1..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png
deleted file mode 100644
index 0ed2ad6ad..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png
deleted file mode 100644
index 221af2806..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png
deleted file mode 100644
index 71a8d4294..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png
deleted file mode 100644
index ba6bf2d00..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png
deleted file mode 100644
index 6271425a3..000000000
--- a/graphics/event_objects/pics/berry_trees/mago/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/event_objects/pics/berry_trees/nomel.png
new file mode 100644
index 000000000..b1c180465
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/nomel.png
diff --git a/graphics/event_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png
deleted file mode 100644
index d504524eb..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png
deleted file mode 100644
index 37ff4b082..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png
deleted file mode 100644
index 4e5c03cb4..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png
deleted file mode 100644
index 7fd46d627..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png
deleted file mode 100644
index 913274d81..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png
deleted file mode 100644
index 3af9a516a..000000000
--- a/graphics/event_objects/pics/berry_trees/nomel/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/event_objects/pics/berry_trees/oran.png
new file mode 100644
index 000000000..7f98da25e
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/oran.png
diff --git a/graphics/event_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png
deleted file mode 100644
index 8770230de..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png
deleted file mode 100644
index afeb286a9..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png
deleted file mode 100644
index 7b7dc8b1a..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png
deleted file mode 100644
index 81857442d..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png
deleted file mode 100644
index 58a197d08..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png
deleted file mode 100644
index 8878c8550..000000000
--- a/graphics/event_objects/pics/berry_trees/oran/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/event_objects/pics/berry_trees/pamtre.png
new file mode 100644
index 000000000..b2d7c590d
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/pamtre.png
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png
deleted file mode 100644
index ac56c5370..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png
deleted file mode 100644
index 105974668..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png
deleted file mode 100644
index 09363b8ba..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png
deleted file mode 100644
index 263856830..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png
deleted file mode 100644
index 509057976..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png
deleted file mode 100644
index 1adf263df..000000000
--- a/graphics/event_objects/pics/berry_trees/pamtre/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/event_objects/pics/berry_trees/pecha.png
new file mode 100644
index 000000000..7078d2bd1
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/pecha.png
diff --git a/graphics/event_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png
deleted file mode 100644
index 8a69441a4..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png
deleted file mode 100644
index 4d1923735..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png
deleted file mode 100644
index a93a37738..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png
deleted file mode 100644
index 5cd4f5e3c..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png
deleted file mode 100644
index 451d74260..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png
deleted file mode 100644
index 242a9b53f..000000000
--- a/graphics/event_objects/pics/berry_trees/pecha/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/event_objects/pics/berry_trees/persim.png
new file mode 100644
index 000000000..ff4d8f808
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/persim.png
diff --git a/graphics/event_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png
deleted file mode 100644
index 1996615ff..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png
deleted file mode 100644
index eda84785f..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png
deleted file mode 100644
index 6e71b3786..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png
deleted file mode 100644
index f45bf0646..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png
deleted file mode 100644
index a5aeda410..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png
deleted file mode 100644
index 72c69c068..000000000
--- a/graphics/event_objects/pics/berry_trees/persim/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/event_objects/pics/berry_trees/pomeg.png
new file mode 100644
index 000000000..78abc73eb
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/pomeg.png
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png
deleted file mode 100644
index c343bc210..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png
deleted file mode 100644
index cc1c08f92..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png
deleted file mode 100644
index 46d0fb7cc..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png
deleted file mode 100644
index d2475b748..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png
deleted file mode 100644
index 4f3019213..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png
deleted file mode 100644
index f519675ce..000000000
--- a/graphics/event_objects/pics/berry_trees/pomeg/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/event_objects/pics/berry_trees/rabuta.png
new file mode 100644
index 000000000..b7a2c85d6
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/rabuta.png
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png
deleted file mode 100644
index 5fe85e4e3..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png
deleted file mode 100644
index 0973e21cb..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png
deleted file mode 100644
index c2d027ebd..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png
deleted file mode 100644
index 79b2cc45f..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png
deleted file mode 100644
index 931350042..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png
deleted file mode 100644
index efa1ac89e..000000000
--- a/graphics/event_objects/pics/berry_trees/rabuta/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/event_objects/pics/berry_trees/rawst.png
new file mode 100644
index 000000000..e0bcac532
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/rawst.png
diff --git a/graphics/event_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png
deleted file mode 100644
index ef3548002..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png
deleted file mode 100644
index dccad21b0..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png
deleted file mode 100644
index d89f7484e..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png
deleted file mode 100644
index afd11e0f6..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png
deleted file mode 100644
index aada33789..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png
deleted file mode 100644
index 311044bf0..000000000
--- a/graphics/event_objects/pics/berry_trees/rawst/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/event_objects/pics/berry_trees/razz.png
new file mode 100644
index 000000000..70f56bc8b
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/razz.png
diff --git a/graphics/event_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png
deleted file mode 100644
index 4685d0977..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png
deleted file mode 100644
index 396122c5b..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png
deleted file mode 100644
index f48a2c6e2..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png
deleted file mode 100644
index 47e6a52c1..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png
deleted file mode 100644
index 075c4674b..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png
deleted file mode 100644
index 7ae7b7bba..000000000
--- a/graphics/event_objects/pics/berry_trees/razz/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/event_objects/pics/berry_trees/sitrus.png
new file mode 100644
index 000000000..bdfece860
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/sitrus.png
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png
deleted file mode 100644
index 64671e0a1..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png
deleted file mode 100644
index 13f82d092..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png
deleted file mode 100644
index 7a382402a..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png
deleted file mode 100644
index 6bbc0dca0..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png
deleted file mode 100644
index 1e6ff6838..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png
deleted file mode 100644
index cd97f552f..000000000
--- a/graphics/event_objects/pics/berry_trees/sitrus/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/event_objects/pics/berry_trees/spelon.png
new file mode 100644
index 000000000..d9b7f4174
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/spelon.png
diff --git a/graphics/event_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png
deleted file mode 100644
index 32bd06af1..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png
deleted file mode 100644
index 37e77e391..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png
deleted file mode 100644
index d36cf3b16..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png
deleted file mode 100644
index 6a7099d83..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png
deleted file mode 100644
index de1c24e58..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png
deleted file mode 100644
index 578231a24..000000000
--- a/graphics/event_objects/pics/berry_trees/spelon/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/event_objects/pics/berry_trees/sprout.png
new file mode 100644
index 000000000..8fee510bd
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/sprout.png
diff --git a/graphics/event_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png
deleted file mode 100644
index df37532a7..000000000
--- a/graphics/event_objects/pics/berry_trees/sprout/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png
deleted file mode 100644
index f0a67f382..000000000
--- a/graphics/event_objects/pics/berry_trees/sprout/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/event_objects/pics/berry_trees/tamato.png
new file mode 100644
index 000000000..d0770746b
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/tamato.png
diff --git a/graphics/event_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png
deleted file mode 100644
index 499e473bc..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png
deleted file mode 100644
index 2c45d60d8..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png
deleted file mode 100644
index ef3ac700b..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png
deleted file mode 100644
index 57b60904f..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png
deleted file mode 100644
index 823ff49a7..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png
deleted file mode 100644
index 8656cb5db..000000000
--- a/graphics/event_objects/pics/berry_trees/tamato/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/event_objects/pics/berry_trees/wepear.png
new file mode 100644
index 000000000..133140843
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/wepear.png
diff --git a/graphics/event_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png
deleted file mode 100644
index ccf834a94..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png
deleted file mode 100644
index d46390bdd..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png
deleted file mode 100644
index 040a70931..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png
deleted file mode 100644
index 94918f7ff..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png
deleted file mode 100644
index ee242d657..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png
deleted file mode 100644
index 1b5256a9e..000000000
--- a/graphics/event_objects/pics/berry_trees/wepear/5.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/event_objects/pics/berry_trees/wiki.png
new file mode 100644
index 000000000..a78d55db4
--- /dev/null
+++ b/graphics/event_objects/pics/berry_trees/wiki.png
diff --git a/graphics/event_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png
deleted file mode 100644
index e51325e18..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/0.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png
deleted file mode 100644
index f7f28e44b..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/1.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png
deleted file mode 100644
index e7d6c3824..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/2.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png
deleted file mode 100644
index 6447302a6..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/3.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png
deleted file mode 100644
index a494a7eaa..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/4.png
+++ /dev/null
diff --git a/graphics/event_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png
deleted file mode 100644
index 5a6b9f193..000000000
--- a/graphics/event_objects/pics/berry_trees/wiki/5.png
+++ /dev/null
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index 546b26f17..e9f700a99 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -166,10 +166,10 @@ const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/peopl
 const u32 gEventObjectPic_ContestOldMan[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man.4bpp");
 const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp");
 const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp");
-const u32 gEventObjectPic_KyogreFront[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");
-const u32 gEventObjectPic_GroudonFront[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp");
+const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");
+const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp");
 const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
-const u32 gEventObjectPic_Skitty_[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp");
+const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp");
 const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp");
 const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp");
 const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp");
@@ -270,188 +270,37 @@ const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphic
 const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp");
 const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp");
 const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
-const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp");
-const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp");
-const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp");
-const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp");
-const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp");
-const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp");
-const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp");
-const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp");
-const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp");
-const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp");
-const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp");
-const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp");
-const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp");
-const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp");
+const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp");
+const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp");
+const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp");
+const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp");
+const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp");
+const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp");
+const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp");
+const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp");
+const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp");
+const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp");
+const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp");
+const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp");
+const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp");
+const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp");
+const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp");
+const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp");
+const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp");
+const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp");
+const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp");
 const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/0.4bpp");
 const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/1.4bpp");
 const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/2.4bpp");