diff options
| author | IIMarckus <iimarckus@gmail.com> | 2013-11-01 20:15:09 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2013-11-01 20:15:09 -0600 |
| commit | c60da440b619508df369e406b6b3353811f2f627 (patch) | |
| tree | c63555da7c2051770f63112746d0c5b8ea57a8f9 /constants.asm | |
| parent | All INCBIN baserom.gbcs begin with \n and all INCBINs of gfx etc begin with \t (diff) | |
| parent | Merge remote-tracking branch 'kanzure/master' into mergetastic (diff) | |
| download | pokeyellow-c60da440b619508df369e406b6b3353811f2f627.tar.gz pokeyellow-c60da440b619508df369e406b6b3353811f2f627.tar.xz pokeyellow-c60da440b619508df369e406b6b3353811f2f627.zip | |
Merge branch 'master' of https://github.com/Sanky/pokered
Conflicts:
main.asm
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index 54f367f1..fa0f3afc 100644 --- a/constants.asm +++ b/constants.asm @@ -259,6 +259,8 @@ W_HPBARDELTA EQU $CEEF W_HPBARHPDIFFERENCE EQU $CEFD +W_BUFFER EQU $CEE9 ; used for temporary things + W_ANIMSOUNDID EQU $CF07 ; sound ID during battle animations ; movement byte 2 of current sprite |