diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 12:09:36 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 12:09:36 -0400 |
commit | 96a58ce52ac4b8c4c8b2ecbf0f185d1ebda10a6e (patch) | |
tree | 94af78e339c96436e8ee2180e19279788659056d /constants | |
parent | aafed67874b49180b4640eeaf5b20981c24ce9fc (diff) |
Split out pikachu engine functions; sprite state data macros
Diffstat (limited to 'constants')
-rw-r--r-- | constants/pikachu_emotion_constants.asm | 4 | ||||
-rwxr-xr-x | constants/sprite_constants.asm | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index 22c1d8ea..ff56082a 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -47,12 +47,12 @@ pikaemotion_emotebubble: MACRO db \1 ENDM -pikaemotion_4: MACRO +pikaemotion_movement: MACRO db PIKAEMOTION_4 dw \1 ENDM -pikaemotion_5: MACRO +pikaemotion_pikapic: MACRO db PIKAEMOTION_5 db \1 ENDM diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index ae0c9dfa..3349e374 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -85,6 +85,8 @@ const_value = 1 const SPRITE_CHANSEY ; $44 const SPRITE_JESSIE ; $45 const SPRITE_JAMES ; $46 + + ; 4-tile sprites const SPRITE_BALL ; $47 const SPRITE_OMANYTE ; $48 const SPRITE_BOULDER ; $49 |