diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
| commit | 11173a3807bde4e2d5b681717258b5b14f5f2d43 (patch) | |
| tree | 8e1692fe02b30ceeb2d797c001e0594175e29b78 /macros.asm | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
| parent | 5322b56a8357e5e5a8847f3329b52faa3f7016d8 (diff) | |
Merge pull request #333 from PikalaxALT/master
Split base stats, rearrange wram.asm, naming screen
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/macros.asm b/macros.asm index 812873584..6656ca038 100644 --- a/macros.asm +++ b/macros.asm @@ -15,6 +15,7 @@ INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" INCLUDE "macros/trainer.asm" INCLUDE "macros/trade_anim.asm" +INCLUDE "macros/pals.asm" RGB: MACRO dw ((\3) << 10) + ((\2) << 5) + (\1) |