diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /macros.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/macros.asm b/macros.asm index 897636c8f..7ed3ecf36 100644 --- a/macros.asm +++ b/macros.asm @@ -1,4 +1,5 @@ INCLUDE "macros/enum.asm" +INCLUDE "macros/basestats.asm" INCLUDE "macros/event.asm" INCLUDE "macros/sound.asm" @@ -12,6 +13,7 @@ INCLUDE "macros/pic.asm" INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" +INCLUDE "macros/trainer.asm" @@ -38,6 +40,11 @@ dbbw: MACRO dw \3 ENDM +dbww: MACRO + db \1 + dw \2, \3 + ENDM + dbwww: MACRO db \1 dw \2, \3, \4 |