Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update evos_attacks.asm #971

Merged
merged 2 commits into from
Feb 14, 2025
Merged

Update evos_attacks.asm #971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9c0544
Update evos_attacks.asm
Penndragyn37 Jul 1, 2024
e75b3c3
Merge branch 'master' into patch-1
vulcandth Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/pokemon/evos_attacks.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ PsyduckEvosAttacks:
db 28, AQUA_TAIL
db 31, RAIN_DANCE ; Soak → TM move
db 34, PSYBEAM ; Psych Up → egg move
db 47, AMNESIA
db 37, AMNESIA
db 40, HYDRO_PUMP
db 43, NASTY_PLOT ; Wonder Room → SV TM move
db 46, PSYCHIC_M ; TM move
Expand Down Expand Up @@ -1258,7 +1258,7 @@ PrimeapeEvosAttacks:
evo_data EVOLVE_MOVE, OUTRAGE, ANNIHILAPE
db -1 ; no more evolutions
db 1, OUTRAGE
db 1, RAGE
db 1, RAGE ; evolution move
db 1, SCRATCH
db 1, LOW_KICK
db 1, LEER
Expand Down Expand Up @@ -1382,7 +1382,7 @@ PoliwhirlEvosAttacks:
db 18, RAIN_DANCE
db 21, BODY_SLAM
db 27, BUBBLE_BEAM
db 28, LOW_KICK ; Mud Shot → LGPE move
db 32, LOW_KICK ; Mud Shot → LGPE move
db 37, BELLY_DRUM
db 43, GROWTH ; Wake-Up Slap → event move
db 48, HYDRO_PUMP
Expand Down Expand Up @@ -2017,7 +2017,7 @@ DodrioEvosAttacks:
db 1, PECK
db 1, GROWL
db 5, QUICK_ATTACK
db 9, RAGE
db 8, RAGE
db 12, FURY_STRIKES ; Fury Attack → similar move
db 15, PURSUIT
db 19, BATON_PASS ; Pluck → XD move
Expand Down Expand Up @@ -3219,7 +3219,7 @@ JolteonEvosAttacks:
db 5, MUD_SLAP ; Sand Attack → similar move
db 9, DOUBLE_KICK ; Baby-Doll Eyes → LGPE move
db 13, QUICK_ATTACK
db 17, DOUBLE_KICK
db 17, SPARK ; Double Kick → new move
db 20, LIGHT_SCREEN ; Thunder Fang → TM move
db 25, PIN_MISSILE
db 29, AGILITY
Expand Down Expand Up @@ -6061,7 +6061,7 @@ TangrowthEvosAttacks:
db 40, ANCIENTPOWER
db 43, BODY_SLAM ; Slam → similar move
db 46, PAIN_SPLIT ; Tickle → HGSS tutor move
db 49, SWORDS_DANCE ; Wring Out → TM move
db 48, SWORDS_DANCE ; Wring Out → TM move
db 50, BATON_PASS ; Grassy Terrain → new move
db 53, POWER_WHIP
db -1 ; no more level-up moves
Expand Down