diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
| commit | d0541164589a5fd2f628bf8629f878430b31c5f7 (patch) | |
| tree | 03599c969ac901a7878b4d4ddbb3d1e01dcd019d /constants/sprite_constants.asm | |
| parent | 59c95abf836e139931a41d20cf95af2472763fab (diff) | |
| parent | 5b7773b7d3ddf1addd99588cc5c41cd81ecdc402 (diff) | |
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
Diffstat (limited to 'constants/sprite_constants.asm')
| -rw-r--r-- | constants/sprite_constants.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 32d386ba7..767d7a3c6 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; OverworldSprites indexes (see gfx/sprite_data.asm) +; OverworldSprites indexes (see data/sprites.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 |