diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /macros.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/macros.asm b/macros.asm index 7036b6419..1018eeb1f 100644 --- a/macros.asm +++ b/macros.asm @@ -3,8 +3,8 @@ INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/data.asm" INCLUDE "macros/code.asm" +INCLUDE "macros/gfx.asm" INCLUDE "macros/coords.asm" -INCLUDE "macros/color.asm" INCLUDE "macros/scripts/audio.asm" INCLUDE "macros/scripts/maps.asm" @@ -16,7 +16,4 @@ INCLUDE "macros/scripts/battle_anims.asm" INCLUDE "macros/scripts/trade_anims.asm" INCLUDE "macros/scripts/gfx_anims.asm" -percent EQUS "* $ff / 100" - -tiles EQUS "* LEN_2BPP_TILE" -tile EQUS "+ LEN_2BPP_TILE *" +INCLUDE "macros/legacy.asm" |