diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 19:14:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 19:14:06 -0500 |
| commit | 05ac706f6052ade04a0d258862a705d3f41283bf (patch) | |
| tree | b4118cd8afebaff6b737b9eefcab9f10330fb5df /macros.asm | |
| parent | 6cf7c0790f3424a4cb472b274a88d04d449d5231 (diff) | |
| parent | e4a61cf1ae40dd84671f5b2e2b1be47fd1055248 (diff) | |
Merge pull request #415 from roukaour/asm-collisions
Use asm, not bin, for collision data
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macros.asm b/macros.asm index f9913bce2..d99b2f4d7 100644 --- a/macros.asm +++ b/macros.asm @@ -13,7 +13,7 @@ INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" INCLUDE "macros/trainer.asm" INCLUDE "macros/trade_anim.asm" -INCLUDE "macros/pals.asm" +INCLUDE "macros/tilesets.asm" RGB: MACRO dw ((\3) << 10) + ((\2) << 5) + (\1) |