diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 00:08:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 00:08:54 -0500 |
| commit | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /macros.asm | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
| parent | 79873a1bfc0e40067c45dc74fbbebf547d177978 (diff) | |
Merge pull request #411 from roukaour/master
Clean up more labels, constants, and file names
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/macros.asm b/macros.asm index 13aff261d..f9913bce2 100644 --- a/macros.asm +++ b/macros.asm @@ -1,11 +1,9 @@ INCLUDE "macros/enum.asm" INCLUDE "macros/basestats.asm" - INCLUDE "macros/event.asm" INCLUDE "macros/sound.asm" INCLUDE "macros/text.asm" INCLUDE "macros/charmap.asm" -INCLUDE "macros/move_effect.asm" INCLUDE "macros/move_anim.asm" INCLUDE "macros/movement.asm" INCLUDE "macros/map.asm" @@ -224,6 +222,7 @@ endr ENDM palettes EQUS "* 8" +palette EQUS "+ 8 *" ldpixel: MACRO if _NARG >= 5 |