diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /constants/sprite_constants.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
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 180be3323..c23a3b246 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_value set $80 + const_def $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.asm) -const_value set $e0 + const_def $e0 const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 ; wVariableSprites indexes (see wram.asm) -const_value set $f0 + const_def $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 const SPRITE_DOLL_1 ; f1 |