diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-30 17:50:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 17:50:33 -0400 |
| commit | 2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch) | |
| tree | fb048bbc8bb7257dbd8169e2442117da5d2b30d2 /constants/pokemon_data_constants.asm | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
| parent | da5125e1411f9599b883181c5ee6e31252d37ac8 (diff) | |
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'constants/pokemon_data_constants.asm')
| -rw-r--r-- | constants/pokemon_data_constants.asm | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 379546c45..1aedf20cb 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -62,11 +62,9 @@ GENDER_UNKNOWN EQU -1 const EGG_DRAGON ; e const EGG_NONE ; f (Undiscovered) - ; pokedex entries (see data/pokemon/dex_entries.asm) NUM_DEX_ENTRY_BANKS EQU 4 - ; party_struct members (see macros/wram.asm) MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" @@ -101,7 +99,6 @@ BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" REDMON_STRUCT_LENGTH EQU 44 - ; caught data CAUGHT_TIME_MASK EQU %11000000 @@ -116,7 +113,6 @@ CAUGHT_BY_BOY EQU 2 CAUGHT_EGG_LEVEL EQU 1 - ; maximum number of party pokemon PARTY_LENGTH EQU 6 @@ -129,7 +125,6 @@ HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, leve HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator NUM_HOF_TEAMS = 30 - ; evolution types (used in data/pokemon/evos_attacks.asm) const_def 1 const EVOLVE_LEVEL @@ -150,7 +145,6 @@ NUM_HOF_TEAMS = 30 const ATK_LT_DEF const ATK_EQ_DEF - ; wild data NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size @@ -162,7 +156,6 @@ FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3 NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) - ; treemon sets ; TreeMons indexes (see data/wild/treemons.asm) const_def @@ -182,7 +175,6 @@ NUM_TREEMON_SETS EQU const_value const TREEMON_SCORE_GOOD ; 1 const TREEMON_SCORE_RARE ; 2 - ; ChangeHappiness arguments (see data/happiness_changes.asm) const_value = 1 const HAPPINESS_GAINLEVEL ; 01 @@ -212,7 +204,6 @@ HAPPINESS_TO_EVOLVE EQU 220 HAPPINESS_THRESHOLD_1 EQU 100 HAPPINESS_THRESHOLD_2 EQU 200 - ; PP PP_UP_MASK EQU %11000000 PP_UP_ONE EQU %01000000 |