diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/battle_tower_constants.asm | 6 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 | ||||
| -rw-r--r-- | constants/radio_constants.asm | 4 | ||||
| -rw-r--r-- | constants/text_constants.asm | 14 |
4 files changed, 13 insertions, 13 deletions
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 4083c9d81..71b8de8be 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,11 +1,11 @@ -BATTLETOWER_PARTY_SIZE EQU 3 -BATTLETOWER_STREAK_SIZE EQU 7 +BATTLETOWER_PARTY_LENGTH EQU 3 +BATTLETOWER_STREAK_LENGTH EQU 7 BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_SIZE * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH +BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 14c6b313f..adcaf9a49 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -50,7 +50,7 @@ MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 ; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_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/radio_constants.asm b/constants/radio_constants.asm index 03d4ede5a..d3f14e34c 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -94,12 +94,12 @@ const POKEDEX_SHOW_7 ; 56 const POKEDEX_SHOW_8 ; 57 -; PlayRadio arguments (see engine/pokegear.asm) +; PlayRadio.StationPointers indexes (see engine/pokegear.asm) const_def const MAPRADIO_POKEMON_CHANNEL const MAPRADIO_OAKS_MON_TALK const MAPRADIO_POKEDEX_SHOW - const MAPRADIO_PKMN_MUSIC + const MAPRADIO_POKEMON_MUSIC const MAPRADIO_LUCKY_CHANNEL const MAPRADIO_UNOWN const MAPRADIO_PLACES_PEOPLE diff --git a/constants/text_constants.asm b/constants/text_constants.asm index 27c42ed92..a6052065c 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -1,16 +1,16 @@ ; name lengths -NAME_LENGTH EQU 11 -PLAYER_NAME_LENGTH EQU 8 -BOX_NAME_LENGTH EQU 9 -PKMN_NAME_LENGTH EQU 11 -MOVE_NAME_LENGTH EQU 13 -ITEM_NAME_LENGTH EQU 13 +NAME_LENGTH EQU 11 +PLAYER_NAME_LENGTH EQU 8 +BOX_NAME_LENGTH EQU 9 +MON_NAME_LENGTH EQU 11 +MOVE_NAME_LENGTH EQU 13 +ITEM_NAME_LENGTH EQU 13 TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH_JAPANESE EQU 6 ; GetName types (see home/names.asm) const_value set 1 - const PKMN_NAME ; 1 + const MON_NAME ; 1 const MOVE_NAME ; 2 const DUMMY_NAME ; 3 const ITEM_NAME ; 4 |