diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-21 14:01:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-21 14:01:05 -0400 |
| commit | 6a6ba10315baf4b0092c6d952a2f0cb502b6ac8e (patch) | |
| tree | 5a32545646f9214cd7674320495cc3e8c6929875 /constants | |
| parent | 5a5f5ececdde2c4c62bdee649d8b1d3edba96fed (diff) | |
rgbds supports 'X - 1' instead of 'X + -1'
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 6 | ||||
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | constants/move_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 4 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index a8a249a5b..7e444059d 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -61,10 +61,10 @@ MOVE_LENGTH EQU const_value const STAT_DEF const STAT_SPD const STAT_SATK -NUM_EXP_STATS EQU const_value + -1 +NUM_EXP_STATS EQU const_value - 1 const STAT_SDEF -NUM_STATS EQU const_value + -1 -NUM_BATTLE_STATS EQU NUM_STATS + -1 ; don't count HP +NUM_STATS EQU const_value - 1 +NUM_BATTLE_STATS EQU NUM_STATS - 1 ; don't count HP ; stat formula constants STAT_MIN_NORMAL EQU 5 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 4f7888c4b..32dcab831 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -287,7 +287,7 @@ ENDM add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM -NUM_TM_HM_TUTOR EQU __enum__ + -1 +NUM_TM_HM_TUTOR EQU __enum__ - 1 const ITEM_FA ; fa diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 472ff2d0b..b26f86d03 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -257,7 +257,7 @@ const ROCK_SMASH ; f9 const WHIRLPOOL ; fa const BEAT_UP ; fb -NUM_ATTACKS EQU const_value + -1 +NUM_ATTACKS EQU const_value - 1 const MOVE_OR_ANIM_FC ; fc const MOVE_OR_ANIM_FD ; fd diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 939ac72f2..c28657b83 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -271,7 +271,7 @@ JOHTO_POKEMON EQU const_value const LUGIA ; f9 const HO_OH ; fa const CELEBI ; fb -NUM_POKEMON EQU const_value + -1 +NUM_POKEMON EQU const_value - 1 const MON_FC ; fc const EGG ; fd const MON_FE ; fe @@ -311,4 +311,4 @@ NUM_POKEMON EQU const_value + -1 const UNOWN_X ; 24 const UNOWN_Y ; 25 const UNOWN_Z ; 26 -NUM_UNOWN EQU const_value + -1 ; 26 +NUM_UNOWN EQU const_value - 1 ; 26 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index cbdbbd17b..c789f40fb 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -124,7 +124,7 @@ MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 ; hall of fame -HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick +HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; species, id, dvs, level, nick HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator NUM_HOF_TEAMS EQU 30 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 30935e632..8d5cc46f7 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -224,7 +224,7 @@ EMOTE_FROM_MEM EQU -1 const FRUITTREE_PEWTER_CITY_1 ; 1c const FRUITTREE_PEWTER_CITY_2 ; 1d const FRUITTREE_FUCHSIA_CITY ; 1e -NUM_FRUIT_TREES EQU const_value + -1 +NUM_FRUIT_TREES EQU const_value - 1 ; describedecoration arguments ; DescribeDecoration.JumpTable indexes (see engine/overworld/decorations.asm) |