diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-15 09:01:56 -0500 |
| commit | 89b695278d0a126279ac232d534aebdc351cc2be (patch) | |
| tree | 2b22248f02a30a906187553274dee989c6ddb74e /asm/macros.inc | |
| parent | 79609d52c8d8489b490589a1150b0754c0f61568 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
Merge branch 'master' into heal_location
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 135cfac61..0c6644002 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -1,5 +1,6 @@ .include "asm/macros/asm.inc" .include "asm/macros/function.inc" + .include "asm/macros/movement.inc" .include "asm/macros/window.inc" .include "asm/macros/pokemon_data.inc" .include "asm/macros/ec.inc" |