diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-25 19:01:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-25 19:01:36 -0500 |
| commit | 73db02d3cdaf81a214ec6faa5462195618a80a48 (patch) | |
| tree | b4d1a5187fda9da6186c52c03e836a5ff8f4dd90 /constants | |
| parent | ec8c9688ce970b9c3b63a5b287a99542f0bc9984 (diff) | |
| parent | 29b41068cb0644956494dd2b7b75331a336b8d26 (diff) | |
Merge pull request #433 from roukaour/master
More code cleanup
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 8 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index f86cd0873..e9d393fcc 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -10,8 +10,12 @@ NUM_MOVES EQU 4 BASE_STAT_LEVEL EQU 7 MAX_STAT_LEVEL EQU 13 -; turns that Rest sleep lasts -REST_TURNS EQU 2 +; minimum damage before type effectiveness +MIN_NEUTRAL_DAMAGE EQU 2 + +; turns that sleep lasts +REST_SLEEP_TURNS EQU 2 +TREEMON_SLEEP_TURNS EQU 7 ; PlayerStatLevels and EnemyStatLevels indexes ; used for GetStatName diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 64c625933..88ae90c89 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -120,3 +120,5 @@ const_value = 1 const HAPPINESS_REVIVALHERB ; 11 const HAPPINESS_MASSAGE ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 + +MAX_DAY_CARE_EXP EQU $500000 |