Merge branch 'master' into master

This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions

View file

@ -27,6 +27,7 @@ EvosAttacksPointers1::
dw ArbokEvosAttacks
dw PikachuEvosAttacks
dw RaichuEvosAttacks
dw GorochuEvosAttacks
dw SandshrewEvosAttacks
dw SandslashEvosAttacks
dw NidoranFEvosAttacks
@ -507,12 +508,25 @@ PikachuEvosAttacks:
db 0 ; no more level-up moves
RaichuEvosAttacks:
dbbw EVOLVE_TRADE, -1, GOROCHU
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, TAIL_WHIP
dbw 1, QUICK_ATTACK
dbw 1, THUNDERBOLT
db 0 ; no more level-up moves
GorochuEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, TAIL_WHIP
dbw 1, QUICK_ATTACK
dbw 1, THUNDERBOLT
dbw 53, SAND_ATTACK
dbw 57, FOCUS_ENERGY
dbw 60, LEER
dbw 65, HORN_DRILL
db 0 ; no more level-up moves
SandshrewEvosAttacks:
dbbw EVOLVE_LEVEL, 22, SANDSLASH