diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 15:42:40 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 16:06:44 -0800 |
| commit | 267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch) | |
| tree | 559417726bbd5f3b18c153c1435f872decfe18b1 /constants/constants.inc | |
| parent | 20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff) | |
| parent | 67ad331441f29545b84d152cbbb4f188098a9c5a (diff) | |
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'constants/constants.inc')
| -rw-r--r-- | constants/constants.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 81d3b72fe..bc55f6723 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -14,7 +14,6 @@ .include "constants/map_constants.inc" .include "constants/berry_constants.inc" .include "constants/map_object_constants.inc" - .include "constants/battle_tower_constants.inc" .include "constants/opponent_constants.inc" .include "constants/decorations.inc" .include "constants/songs.inc" |