diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/deco_constants.asm | 3 | ||||
| -rw-r--r-- | constants/item_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 |
5 files changed, 6 insertions, 7 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 84fcdb94d..3b0230965 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -121,8 +121,7 @@ __enum__ = 0 deco GEODUDE_DOLL deco MACHOP_DOLL deco TENTACOOL_DOLL +NUM_NON_TROPHY_DECOS = __enum__ deco GOLD_TROPHY_DOLL deco SILVER_TROPHY_DOLL - NUM_DECOS = __enum__ -NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 0914e7ab6..455af6d12 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -288,7 +288,7 @@ NUM_HMS = const_value - HM01 add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM -NUM_TM_HM_TUTOR = __enum__ +- 1 +NUM_TM_HM_TUTOR = __enum__ + -1 USE_SCRIPT_VAR EQU $00 ITEM_FROM_MEM EQU $ff diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index a72145c54..939ac72f2 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 038a1c34d..66a273eaa 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -125,7 +125,7 @@ MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 ; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick +HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator NUM_HOF_TEAMS = 30 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index c2de2b04f..e610c25f6 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -200,7 +200,7 @@ EMOTE_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/decorations.asm) |