diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:08:43 -0500 |
| commit | 533df93dc16c6af8666033711ce66b4d9a4afd64 (patch) | |
| tree | 710b66921d56cee486f8aa21a3d8215e05b39715 /asm/macros.inc | |
| parent | 30f01c7df68bb9cf80ece491a457c8ce96c52c83 (diff) | |
| parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) | |
Merge branch 'master' into doc-caves
Diffstat (limited to 'asm/macros.inc')
| -rw-r--r-- | asm/macros.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index ffbe3db29..0e53dc2a2 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -5,6 +5,7 @@ .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/m4a.inc" + .include "asm/macros/trainer_tower.inc" .macro region_map_location x, y, width, height, name .byte \x |