Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of _CRYSTAL

Browse Source 
Having this here is completely redundant and useless, and doesn't even
work since it should use `if DEF(_CRYSTAL)` instead.
This commit is contained in:
mid-kid
2019-05-12 16:45:41 +02:00
parent 13cfe356d6
commit 649c8d38da
6 changed files with 3 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
data/pokemon/evos_attacks.asm
View File

@@ -670,9 +670,7 @@ DiglettEvosAttacks:
DugtrioEvosAttacks:
db 0 ; no more evolutions
if _CRYSTAL
db 1, TRI_ATTACK
endc
db 1, SCRATCH
db 1, GROWL
db 1, MAGNITUDE
@@ -1115,11 +1113,7 @@ MagnetonEvosAttacks:
db 16, SONICBOOM
db 21, THUNDER_WAVE
db 27, LOCK_ON
if _CRYSTAL
db 35, TRI_ATTACK
else
db 35, SWIFT
endc
db 43, SCREECH
db 53, ZAP_CANNON
db 0 ; no more level-up moves
@@ -1235,9 +1229,7 @@ CloysterEvosAttacks:
db 1, SUPERSONIC
db 1, AURORA_BEAM
db 1, PROTECT
if _CRYSTAL
db 33, SPIKES
endc
db 41, SPIKE_CANNON
db 0 ; no more level-up moves
@@ -1814,11 +1806,7 @@ EeveeEvosAttacks:
db 16, GROWL
db 23, QUICK_ATTACK
db 30, BITE
if _CRYSTAL
db 36, BATON_PASS
else
db 36, FOCUS_ENERGY
endc
db 42, TAKE_DOWN
db 0 ; no more level-up moves
@@ -2297,11 +2285,7 @@ SpinarakEvosAttacks:
db 23, LEECH_LIFE
db 30, FURY_SWIPES
db 37, SPIDER_WEB
if _CRYSTAL
db 45, AGILITY
else
db 45, SCREECH
endc
db 53, PSYCHIC_M
db 0 ; no more level-up moves
@@ -2317,11 +2301,7 @@ AriadosEvosAttacks:
db 25, LEECH_LIFE
db 34, FURY_SWIPES
db 43, SPIDER_WEB
if _CRYSTAL
db 53, AGILITY
else
db 53, SCREECH
endc
db 63, PSYCHIC_M
db 0 ; no more level-up moves
@@ -2544,11 +2524,7 @@ HoppipEvosAttacks:
db EVOLVE_LEVEL, 18, SKIPLOOM
db 0 ; no more evolutions
db 1, SPLASH
if _CRYSTAL
db 5, SYNTHESIS
else
db 1, SYNTHESIS
endc
db 5, TAIL_WHIP
db 10, TACKLE
db 13, POISONPOWDER
@@ -2566,9 +2542,7 @@ SkiploomEvosAttacks:
db 1, SYNTHESIS
db 1, TAIL_WHIP
db 1, TACKLE
if _CRYSTAL
db 5, SYNTHESIS
endc
db 5, TAIL_WHIP
db 10, TACKLE
db 13, POISONPOWDER
@@ -2585,9 +2559,7 @@ JumpluffEvosAttacks:
db 1, SYNTHESIS
db 1, TAIL_WHIP
db 1, TACKLE
if _CRYSTAL
db 5, SYNTHESIS
endc
db 5, TAIL_WHIP
db 10, TACKLE
db 13, POISONPOWDER
@@ -2641,11 +2613,7 @@ YanmaEvosAttacks:
db 19, SONICBOOM
db 25, DETECT
db 31, SUPERSONIC
if _CRYSTAL
db 37, WING_ATTACK
else
db 37, SWIFT
endc
db 43, SCREECH
db 0 ; no more level-up moves
@@ -2857,9 +2825,7 @@ GranbullEvosAttacks:
QwilfishEvosAttacks:
db 0 ; no more evolutions
if _CRYSTAL
db 1, SPIKES
endc
db 1, TACKLE
db 1, POISON_STING
db 10, HARDEN
@@ -2919,9 +2885,7 @@ SneaselEvosAttacks:
db 41, AGILITY
db 49, SLASH
db 57, BEAT_UP
if _CRYSTAL
db 65, METAL_CLAW
endc
db 0 ; no more level-up moves
TeddiursaEvosAttacks:
@@ -2989,9 +2953,7 @@ SwinubEvosAttacks:
db 28, TAKE_DOWN
db 37, MIST
db 46, BLIZZARD
if _CRYSTAL
db 55, AMNESIA
endc
db 0 ; no more level-up moves
PiloswineEvosAttacks:
@@ -3005,9 +2967,7 @@ PiloswineEvosAttacks:
db 33, FURY_ATTACK
db 42, MIST
db 56, BLIZZARD
if _CRYSTAL
db 70, AMNESIA
endc
db 0 ; no more level-up moves
CorsolaEvosAttacks:
@@ -3300,17 +3260,10 @@ SuicuneEvosAttacks:
db 0 ; no more evolutions
db 1, BITE
db 1, LEER
if _CRYSTAL
db 11, BUBBLEBEAM
db 21, RAIN_DANCE
db 31, GUST
db 41, AURORA_BEAM
else
db 11, WATER_GUN
db 21, ROAR
db 31, GUST
db 41, BUBBLEBEAM
endc
db 51, MIST
db 61, MIRROR_COAT
db 71, HYDRO_PUMP