diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 1 | ||||
| -rw-r--r-- | constants/item_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_data_constants.asm | 5 | ||||
| -rw-r--r-- | constants/radio_constants.asm | 3 | ||||
| -rw-r--r-- | constants/type_constants.asm | 10 |
5 files changed, 13 insertions, 8 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 1feb37fe3..816625e60 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -63,6 +63,7 @@ const_value set 1 const STAT_SATK const STAT_SDEF NUM_STATS EQU const_value +STAT_SPC EQU STAT_SATK ; stat formula constants STAT_MIN_NORMAL EQU 5 diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index dfcff9eb0..ae08419f3 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -164,7 +164,7 @@ const_value set 70 ; PartyMenuActionText values -; GetPartyMenuTilemapPointers arguments (see engine/party_menu.asm) +; GetPartyMenuQualityIndexes arguments (see engine/party_menu.asm) const_def const PARTYMENUACTION_CHOOSE_POKEMON const PARTYMENUACTION_HEALING_ITEM diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 33a743a96..0fcb10146 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -244,6 +244,7 @@ NUM_TREEMON_SETS EQU const_value EMOTE_MEM EQU -1 ; FruitTreeItems indexes (see data/items/fruit_trees.asm) +; used by fruittree command const_value set 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 @@ -278,8 +279,8 @@ const_value set 1 NUM_FRUIT_TREES EQU const_value +- 1 -; elevator floors -; used by elevfloor +; ElevatorFloorNames indexes (see data/elevator_floors.asm) +; used by elevfloor macro const_def const FLOOR_B4F const FLOOR_B3F diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index 8c7572910..03d4ede5a 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -1,7 +1,8 @@ ; radio channel ids ; indexes for: -; - PlayRadioShow/RadioJumptable (see engine/radio.asm) ; - RadioChannelSongs (see data/radio/channel_music.asm) +; - PlayRadioShow/RadioJumptable (see engine/radio.asm) +; - RadioChannels (see engine/radio.asm) const_def const OAKS_POKEMON_TALK ; 00 const POKEDEX_SHOW ; 01 diff --git a/constants/type_constants.asm b/constants/type_constants.asm index c2cf2d709..6587c3a70 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -1,7 +1,8 @@ -; TypeNames indexes (see data/type_names.asm) +; TypeNames indexes (see data/types/names.asm) ; also used in: -; - TypeMatchups (see data/type_matchups.asm) -; - Pokedex_SearchForMons.TypeConversionTable and Pokedex_PlaceSearchScreenTypeStrings.TypeStrings (see engine/pokedex.asm) +; - PokedexTypeSearchConversionTable (see data/types/search_types.asm) +; - PokedexTypeSearchStrings (see data/types/search_strings.asm) +; - TypeMatchups (see data/battle/type_matchups.asm) const_def PHYSICAL EQU const_value @@ -38,5 +39,6 @@ SPECIAL EQU const_value const ICE const DRAGON const DARK - TYPES_END EQU const_value + +NUM_TYPES EQU TYPES_END + UNUSED_TYPES - UNUSED_TYPES_END |