diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:21:31 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:24:59 +0200 |
| commit | 9aa6b55d7b1fdb97426305c0ed07fc14012f1293 (patch) | |
| tree | b1123bc6dc8d5f29577ad7518f49042f210571d2 /constants | |
| parent | a91b59ab5dd2468e3f48079d45f90a9625a29fe3 (diff) | |
| parent | 748d4249805c19399b3c72c0f60d0f1a6ffe43ad (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
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 |