Skip to content

Commit

Permalink
Small Changes
Browse files Browse the repository at this point in the history
- Minor move parity changes
- Exeggcute and Exeggutor now learn dream eater by TM
- Cubone and Marowak now learn swords dance by TM
- Ndorina gets Sludge and Earthquake to closer match Nidoqueen
- Readme update
  • Loading branch information
cRz-Shadows committed Jun 27, 2024
1 parent 8c927a5 commit 3a5358e
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ These videos also provide an overview of the hack and the ideology behind it:
- Veganlies2me - [Adding Gender Selection (original tutorial done by Mateo)](https://github.com/pret/pokered/wiki/Adding-Gender-Selection-(original-tutorial-done-by-Mateo))
- etdv-thevoid - [(Removed) Fourth palette for party icons](https://github.com/etdv-thevoid/Pokemon_Yellow_Legacy/tree/mon-icon-pal-fix)
- SatoMew (presumably more people worked on these but satomew is the only page author) - [Bugs and Glitches](https://github.com/pret/pokered/wiki/%5BARCHIVED%5D-Bugs-and-Glitches)
- rjd1922 - [Suggested corrections](https://github.com/cRz-Shadows/Pokemon_Yellow_Legacy/commit/8c927a551da31c750b81fa1baad1c5b376128331)


### Other Credits:
Expand Down
20 changes: 10 additions & 10 deletions data/moves/moves.asm
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ Moves:
move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, BIRD, 100, 15
move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15
move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25
move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 100, 35
move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 100, 35
move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5
move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 100, 35
move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15
move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20
move TAKE_DOWN, RECOIL_EFFECT, 95, NORMAL, 100, 20
move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20
move DOUBLE_EDGE, RECOIL_EFFECT, 120, NORMAL, 100, 10
move DOUBLE_EDGE, RECOIL_EFFECT, 120, NORMAL, 100, 15
move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, BIRD, 100, 30
move POISON_STING, POISON_SIDE_EFFECT1, 35, POISON, 100, 35
move TWINEEDLE, TWINEEDLE_EFFECT, 40, BUG, 100, 20
Expand All @@ -68,7 +68,7 @@ Moves:
move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25
move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 85, 10
move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15
move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10
move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 15
move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 85, 5
move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC_TYPE, 100, 20
move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20
Expand Down Expand Up @@ -101,10 +101,10 @@ Moves:
move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 95, 25
move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10
move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5
move DIG, CHARGE_EFFECT, 70, GROUND, 100, 15
move DIG, CHARGE_EFFECT, 70, GROUND, 100, 20
move TOXIC, POISON_EFFECT, 0, POISON, 85, 10
move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC_TYPE, 100, 25
move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC_TYPE, 100, 10
move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC_TYPE, 100, 15
move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC_TYPE, 60, 20
move MEDITATE, ATTACK_UP1_EFFECT, 0, BIRD, 100, 40
move AGILITY, SPEED_UP2_EFFECT, 0, BIRD, 100, 30
Expand All @@ -130,8 +130,8 @@ Moves:
move BIDE, BIDE_EFFECT, 0, BIRD, 100, 10
move METRONOME, METRONOME_EFFECT, 0, BIRD, 100, 10
move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20
move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5
move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, GRASS, 100, 10
move SELFDESTRUCT, EXPLODE_EFFECT, 200, NORMAL, 100, 5
move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, GRASS, 100, 15
move LICK, PARALYZE_SIDE_EFFECT2, 40, GHOST, 100, 30
move SMOG, POISON_SIDE_EFFECT2, 40, POISON, 80, 20
move SLUDGE, POISON_SIDE_EFFECT2, 90, POISON, 100, 20
Expand All @@ -153,7 +153,7 @@ Moves:
move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 20
move LEECH_LIFE, DRAIN_HP_EFFECT, 50, BUG, 100, 25
move LOVELY_KISS, SLEEP_EFFECT, 0, BIRD, 75, 10
move SKY_ATTACK, NO_ADDITIONAL_EFFECT, 120, FLYING, 85, 5
move SKY_ATTACK, NO_ADDITIONAL_EFFECT, 120, FLYING, 85, 10
move TRANSFORM, TRANSFORM_EFFECT, 0, BIRD, 100, 10
move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 10, WATER, 100, 30
move DIZZY_PUNCH, CONFUSION_SIDE_EFFECT, 70, NORMAL, 100, 20
Expand All @@ -163,8 +163,8 @@ Moves:
move SPLASH, SPLASH_EFFECT, 0, BIRD, 100, 40
move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, BIRD, 100, 40
move CRABHAMMER, NO_ADDITIONAL_EFFECT, 110, WATER, 100, 10
move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5
move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15
move EXPLOSION, EXPLODE_EFFECT, 250, NORMAL, 100, 5
move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 20
move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 20
move REST, HEAL_EFFECT, 0, BIRD, 100, 10
move ROCK_SLIDE, FLINCH_SIDE_EFFECT1, 75, ROCK, 95, 15
Expand Down
3 changes: 2 additions & 1 deletion data/pokemon/base_stats/cubone.asm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \
FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \
FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, CUT, STRENGTH
FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, CUT, STRENGTH, \
SWORDS_DANCE
; end

db 0 ; padding
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/exeggcute.asm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \
SUBSTITUTE, SOFTBOILED, MEGA_DRAIN
SUBSTITUTE, SOFTBOILED, MEGA_DRAIN, DREAM_EATER
; end

db 0 ; padding
2 changes: 1 addition & 1 deletion data/pokemon/base_stats/exeggutor.asm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \
DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \
SOFTBOILED, REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH, \
MEGA_DRAIN
MEGA_DRAIN, DREAM_EATER
; end

db 0 ; padding
4 changes: 2 additions & 2 deletions data/pokemon/base_stats/marowak.asm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \
BIDE, FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \
CUT, STRENGTH
BIDE, FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \
CUT, STRENGTH, SWORDS_DANCE
; end

db 0 ; padding
2 changes: 2 additions & 0 deletions data/pokemon/evos_moves.asm
Original file line number Diff line number Diff line change
Expand Up @@ -2295,7 +2295,9 @@ NidorinaEvosMoves:
db 21, HEADBUTT
db 24, DIG
db 27, TAIL_WHIP
db 32, SLUDGE
db 36, FURY_SWIPES
db 40, EARTHQUAKE
db 0

GeodudeEvosMoves:
Expand Down

0 comments on commit 3a5358e

Please sign in to comment.