diff options
Diffstat (limited to 'constants')
-rw-r--r-- | constants/battle_constants.asm | 6 | ||||
-rw-r--r-- | constants/deco_constants.asm | 2 | ||||
-rw-r--r-- | constants/event_flags.asm | 6 | ||||
-rw-r--r-- | constants/item_constants.asm | 4 | ||||
-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 | ||||
-rw-r--r-- | constants/type_constants.asm | 4 |
9 files changed, 16 insertions, 16 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/deco_constants.asm b/constants/deco_constants.asm index d18018214..09d292d59 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -13,7 +13,7 @@ const_value = 1 const MAGNAPLANT const TROPICPLANT const JUMBOPLANT - const TOWN_MAP_D + const TOWN_MAP_POSTER const FAMICOM const SUPER_NES const NINTENDO_64 diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c15e82dad..1fb88e524 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -701,10 +701,10 @@ const EVENT_DECO_PLANT_1 const EVENT_DECO_PLANT_2 const EVENT_DECO_PLANT_3 - const EVENT_DECO_PLANT_4 - const EVENT_DECO_POSTER_1 ; 2b0 - const EVENT_DECO_POSTER_2 + const EVENT_DECO_POSTER_1 + const EVENT_DECO_POSTER_2 ; 2b0 const EVENT_DECO_POSTER_3 + const EVENT_DECO_POSTER_4 const EVENT_DECO_FAMICOM const EVENT_DECO_SNES const EVENT_DECO_N64 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 4f7888c4b..06ad1dc14 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -103,7 +103,7 @@ const MYSTIC_WATER ; 5f const TWISTEDSPOON ; 60 const WHT_APRICORN ; 61 - const BLACKBELT ; 62 + const BLACKBELT_I ; 62 const BLK_APRICORN ; 63 const ITEM_64 ; 64 const PNK_APRICORN ; 65 @@ -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) diff --git a/constants/type_constants.asm b/constants/type_constants.asm index c3524e9d9..3fb9649aa 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -28,7 +28,7 @@ UNUSED_TYPES EQU const_value const TYPE_16 const TYPE_17 const TYPE_18 - const CURSE_T + const CURSE_TYPE UNUSED_TYPES_END EQU const_value SPECIAL EQU const_value @@ -36,7 +36,7 @@ SPECIAL EQU const_value const WATER const GRASS const ELECTRIC - const PSYCHIC + const PSYCHIC_TYPE const ICE const DRAGON const DARK |