diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:13:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 11:13:58 -0500 |
| commit | 1d006c26616889c7f53ba418c34d0cb151d5ba86 (patch) | |
| tree | c5a81e833e822125212ae676fbd0cfae4bd1daae /asm/macros.inc | |
| parent | 4ab216f309fe2db2cd2abfa775fa235f59178791 (diff) | |
| parent | 04130a97d9ff799c9f1b439d091c0116adb31bfb (diff) | |
Merge branch 'master' into doc-tilesets
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 |