diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-23 17:39:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 17:39:15 -0700 |
| commit | fe8629615bb6e847ab632797ff1291c02e70a35c (patch) | |
| tree | 20b7bbb74a99a7b96d0f33d3ef79641bffd21374 /data | |
| parent | 7529e63a5aafad47543b1651474ec6b143cb958a (diff) | |
| parent | c5241d9e80582b746d050ac4424393ccc1636d4b (diff) | |
Merge pull request #449 from ProjectRevoTPP/clean_berry
document berry.c.
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/berry_tree.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 9e219a339..be1cafbdd 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -41,7 +41,7 @@ Route102_EventScript_1A1558:: @ 81A1558 Route102_EventScript_1A1577:: @ 81A1577 fadescreen 1 closemessage - special sub_80B4EE4 + special Berry_FadeAndGoToBerryBagMenu waitstate compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 diff --git a/data/specials.inc b/data/specials.inc index 6ce9b5b1e..c11cedf00 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,7 +51,7 @@ gSpecials:: def_special sub_80C5568 def_special sub_8083BDC def_special FieldObjectInteractionGetBerryTreeData - def_special sub_80B4EE4 + def_special Berry_FadeAndGoToBerryBagMenu def_special FieldObjectInteractionPlantBerryTree def_special FieldObjectInteractionPickBerryTree def_special FieldObjectInteractionRemoveBerryTree |