diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-01-03 19:00:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 19:00:46 -0500 |
| commit | 3650232398d6d75a5bcdfc99c3c3bb73ddd54751 (patch) | |
| tree | 548641f7d227b731bb67b0cecc45994d6cc54c5c /constants/pokemon_data_constants.asm | |
| parent | 583838a39d0c9ddd2440f9c12747a616b377e7ec (diff) | |
| parent | 36ebcdd8fe5c8191e1d59a15259654862de64193 (diff) | |
Merge pull request #590 from Rangi42/master
Clean up some Odd Egg and Battle Tower code and data
Diffstat (limited to 'constants/pokemon_data_constants.asm')
| -rw-r--r-- | constants/pokemon_data_constants.asm | 12 |
1 files changed, 7 insertions, 5 deletions
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) |