diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:28:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-28 10:28:43 -0500 |
commit | 1912b0cf0a0f42f23200ecffcb22651015478ef6 (patch) | |
tree | d855404809d36965aaa76784bae08bdf6ea92cc7 /asm/macros.inc | |
parent | 2dfa84c10ff497d73b3a201480fa568ba62e5a38 (diff) | |
parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) |
Merge branch 'master' into doc-rtcscreen
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" |