diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
| commit | c28d691ff2821adcf43600a308d523fd609e12e2 (patch) | |
| tree | 5cfe618a442bb4a67b4aaef0c7f2c27d4bd3eedb /data/event_scripts.s | |
| parent | 19b0a0f3e05c73b84e5afaffb83080474774e918 (diff) | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 3b25ceab4..1839c3547 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3269,6 +3269,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" |