diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /asm/macros.inc | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'asm/macros.inc')
| -rw-r--r-- | asm/macros.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index 7c35e059d..6782f4200 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -6,6 +6,17 @@ .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/field_effect_script.inc" + .include "asm/macros/trainer_hill.inc" + .include "asm/macros/battle_tent.inc" + .include "asm/macros/battle_frontier/apprentice.inc" + .include "asm/macros/battle_frontier/battle_arena.inc" + .include "asm/macros/battle_frontier/battle_dome.inc" + .include "asm/macros/battle_frontier/battle_factory.inc" + .include "asm/macros/battle_frontier/battle_palace.inc" + .include "asm/macros/battle_frontier/battle_pike.inc" + .include "asm/macros/battle_frontier/battle_pyramid.inc" + .include "asm/macros/battle_frontier/battle_tower.inc" + .include "asm/macros/battle_frontier/frontier_util.inc" .macro region_map_entry x, y, width, height, name .byte \x |