diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_tower_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 0965d626a..9bf7bd7aa 100644 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -5,7 +5,7 @@ BATTLETOWER_NUM_UNIQUE_MON EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH +BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)" ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 1aedf20cb..ac88133d6 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -97,6 +97,8 @@ MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)" MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" + +NICKNAMED_MON_STRUCT_LENGTH EQUS "(PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)" REDMON_STRUCT_LENGTH EQU 44 ; caught data @@ -121,9 +123,9 @@ 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_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator -NUM_HOF_TEAMS = 30 +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 ; evolution types (used in data/pokemon/evos_attacks.asm) const_def 1 @@ -150,8 +152,8 @@ NUM_HOF_TEAMS = 30 NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size -GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 -WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 +GRASS_WILDDATA_LENGTH EQU 2 + (1 + NUM_GRASSMON * 2) * 3 +WATER_WILDDATA_LENGTH EQU 2 + (1 + NUM_WATERMON * 2) * 1 FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3 NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) |