summaryrefslogtreecommitdiff
path: root/data/scripts/berry_tree.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-29 21:05:29 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-29 21:06:07 -0400
commit22c795304d6c1edb568dfde9c6de2091d9470785 (patch)
treea8649b3252b5838f5edf0468f7645ae078fcb057 /data/scripts/berry_tree.inc
parent8bbb75fba0d8dc81be6cfc88a4d7fd932efa900e (diff)
parentc1c2015f7046676b043641c0d1f9d9e29bc73647 (diff)
Merge branch 'master' into trade
Diffstat (limited to 'data/scripts/berry_tree.inc')
-rw-r--r--data/scripts/berry_tree.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1bbe7d355..f4707d8cb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,4 +1,4 @@
-BerryTreeScript:: @ 81A14DD
+S_BerryTree:: @ 81A14DD
special FieldObjectInteractionGetBerryTreeData
switch 0x8004
case 255, Route102_EventScript_1A1533