summaryrefslogtreecommitdiff
path: root/data/scripts/berry_tree.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:41:17 -0400
commit6235276ca255a2b345c3a97be23c6b53be6eba0f (patch)
tree81930ebec5d50f4b44575b28979549c34f2e1b0e /data/scripts/berry_tree.inc
parent170c82f299905b6e55b20a5c2c04f92353131d0e (diff)
parentc1c2015f7046676b043641c0d1f9d9e29bc73647 (diff)
Merge branch 'master' into daycare
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