diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-26 21:25:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 21:25:12 -0400 |
| commit | 748d4249805c19399b3c72c0f60d0f1a6ffe43ad (patch) | |
| tree | 4c6bf942372fda10691e4ca3d0d74490f561a982 /constants | |
| parent | 60ffde3752d079d557dab9a8acecb0bc9e5d46aa (diff) | |
| parent | 9a1ae1332cd98abd65c2f26a1ae4d65c6450530a (diff) | |
Merge pull request #544 from Rangi42/master
Various fixes found while writing tutorials
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 2 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index e9fe6acbd..781f27d21 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -63,7 +63,7 @@ MOVE_LENGTH EQU const_value const STAT_SATK NUM_EXP_STATS EQU const_value + -1 const STAT_SDEF -NUM_STATS EQU const_value +NUM_STATS EQU const_value +- 1 STAT_SPC EQU STAT_SATK ; stat formula constants diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 41a67a648..70b243447 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -49,6 +49,6 @@ NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM const ANIM_MON_TRADE const ANIM_MON_EVOLVE const ANIM_MON_HATCH - const ANIM_MON_UNUSED + const ANIM_MON_HOF const ANIM_MON_EGG1 const ANIM_MON_EGG2 |