diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:27:50 -0500 |
| commit | 3f5936239785c8dae923e1f5c4bb91492e67cb5a (patch) | |
| tree | cb0c74dc4a2c09551e1b6699b7c71ed7dc7c85d7 /asm/macros.inc | |
| parent | 763724a98046c81da15dd5a5877ad30adb8129ba (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-pokejump
Diffstat (limited to 'asm/macros.inc')
| -rw-r--r-- | asm/macros.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/asm/macros.inc b/asm/macros.inc index 6782f4200..77f44a847 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -3,7 +3,6 @@ .include "asm/macros/movement.inc" .include "asm/macros/window.inc" .include "asm/macros/pokemon_data.inc" - .include "asm/macros/ec.inc" .include "asm/macros/map.inc" .include "asm/macros/field_effect_script.inc" .include "asm/macros/trainer_hill.inc" |