diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-10 20:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 20:06:25 -0400 |
| commit | 4fb008844030283ad34cb0802b088b4dd7c9891c (patch) | |
| tree | 6854c5ea9c5311b677bfbcae0616f0979b754060 /constants/sprite_constants.asm | |
| parent | 9e4a00af4523cdfacbb6b245679e2e60fbc6b375 (diff) | |
| parent | c086de0c986330b09cd5e9fa384b950107ee4955 (diff) | |
Merge pull request #740 from Rangi42/master
Remove enum; add const_skip and const_next
Diffstat (limited to 'constants/sprite_constants.asm')
| -rw-r--r-- | constants/sprite_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 8f089ee39..e93ca5da2 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -106,7 +106,7 @@ const SPRITE_STANDING_YOUNGSTER ; 66 ; SpriteMons indexes (see data/sprites/sprite_mons.asm) - const_def $80 + const_next $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 const SPRITE_GEODUDE ; 81 @@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value const SPRITE_HO_OH ; a2 ; special GetMonSprite values (see engine/overworld/overworld.asm) - const_def $e0 + const_next $e0 const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 ; wVariableSprites indexes (see wram.asm) - const_def $f0 + const_next $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 const SPRITE_DOLL_1 ; f1 |