diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /data/scripts/berry_tree.inc | |
parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
Merge branch 'master' into daycare
Diffstat (limited to 'data/scripts/berry_tree.inc')
-rw-r--r-- | data/scripts/berry_tree.inc | 2 |
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 |