diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /macros.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/macros.asm b/macros.asm index f9913bce2..9b7bdf78c 100644 --- a/macros.asm +++ b/macros.asm @@ -13,10 +13,15 @@ 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 +rept _NARG / 3 dw ((\3) << 10) + ((\2) << 5) + (\1) + shift + shift + shift +endr ENDM |