diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
| commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
| tree | c8297d41af868eac80642c1f811bc009fa142099 /data-de | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'data-de')
| -rw-r--r-- | data-de/event_scripts.s | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 1569e87c6..7e43905bf 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3279,6 +3279,7 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return + .include "data/scripts/debug.inc" .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" |