summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-31 11:45:18 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-31 11:45:18 -0500
commitb8f4b1b8a7991222ae2320e5891ded675d541043 (patch)
treecb815dd74f32c3a262f55e57286b174161ebe3e7 /data
parent08891da82254aa4051bf594d4abc2db8e4043d8f (diff)
MINERAL egg group works
Diffstat (limited to 'data')
-rw-r--r--data/pokemon/base_stats/ditto.asm2
-rw-r--r--data/pokemon/base_stats/electrode.asm2
-rw-r--r--data/pokemon/base_stats/geodude.asm2
-rw-r--r--data/pokemon/base_stats/golem.asm2
-rw-r--r--data/pokemon/base_stats/graveler.asm2
-rw-r--r--data/pokemon/base_stats/magnemite.asm2
-rw-r--r--data/pokemon/base_stats/magneton.asm2
-rw-r--r--data/pokemon/base_stats/onix.asm2
-rw-r--r--data/pokemon/base_stats/porygon.asm2
-rw-r--r--data/pokemon/base_stats/porygon2.asm2
-rw-r--r--data/pokemon/base_stats/steelix.asm2
-rw-r--r--data/pokemon/base_stats/sudowoodo.asm2
-rw-r--r--data/pokemon/base_stats/voltorb.asm2
13 files changed, 13 insertions, 13 deletions
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index cb449773d..71a5b4762 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/ditto/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn LADIES_MAN, LADIES_MAN ; egg groups
+ dn POLY, POLY ; egg groups
; tm/hm learnset
tmhm
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 48ae46276..f00eed0cc 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/electrode/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 9664d4318..b3c3603ba 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/geodude/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_SLOW ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index 18c83b397..6de25b590 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/golem/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_SLOW ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index 0a19caf64..98eaef882 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/graveler/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_SLOW ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 0a5620487..aff31035e 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/magnemite/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index b5faa573a..0b694fcf6 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/magneton/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index a28fe72d9..45e38bb32 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/onix/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index b9c6f7df7..aee297b9d 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/porygon/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 50022cae8..8cc3211ef 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/porygon2/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index d337a2d52..2908396fc 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/steelix/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index ecd0b4be4..52ff96429 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/sudowoodo/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 34f4f6d90..0bbcd7275 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/voltorb/front.dimensions"
db 0, 0, 0, 0 ; padding
db MEDIUM_FAST ; growth rate
- dn INANIMATE, INANIMATE ; egg groups
+ dn MINERAL, MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT