Skip to content

Commit 45dbde7

Browse files
AxeljkAxeljk
committed
Expands movesets for ice Pokemon, and incorporates Powder Snow.
1 parent babb93a commit 45dbde7

File tree

7 files changed

+69
-51
lines changed

7 files changed

+69
-51
lines changed

‎data/pokemon/base_stats/cloyster.asm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions
1111
dw CloysterPicFront, CloysterPicBack
1212

13-
db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset
13+
db SPIKE_CANNON, WITHDRAW, CLAMP, AURORA_BEAM ; level 1 learnset
1414
db GROWTH_SLOW ; growth rate
1515

1616
; tm/hm learnset
17-
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
18-
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \
19-
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \
20-
SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \
21-
SURF
17+
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
18+
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
19+
RAGE, DIG, DOUBLE_TEAM, REFLECT, BIDE, \
20+
SELFDESTRUCT, SWIFT, REST, EXPLOSION, TRI_ATTACK, \
21+
SUBSTITUTE, SURF
2222
; end
2323

2424
db 0 ; padding

‎data/pokemon/base_stats/dewgong.asm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
db 90, 70, 80, 70, 95
44
; hp atk def spd spc
55

6-
db WATER, ICE ; type
6+
db ICE, ICE ; type
77
db 75 ; catch rate
88
db 176 ; base exp
99

1010
INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions
1111
dw DewgongPicFront, DewgongPicBack
1212

13-
db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset
13+
db HEADBUTT, GROWL, POWDER_SNOW, WATER_GUN ; level 1 learnset
1414
db GROWTH_MEDIUM_FAST ; growth rate
1515

1616
; tm/hm learnset
17-
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
18-
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
19-
PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \
20-
SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH
17+
tmhm HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
18+
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, PAY_DAY, \
19+
RAGE, MIMIC, BIDE, SKULL_BASH, REST, \
20+
SUBSTITUTE, SURF, STRENGTH
2121
; end
2222

2323
db 0 ; padding

‎data/pokemon/base_stats/jynx.asm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions
1111
dw JynxPicFront, JynxPicBack
1212

13-
db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset
13+
db POUND, SING, NO_MOVE, NO_MOVE ; level 1 learnset
1414
db GROWTH_MEDIUM_FAST ; growth rate
1515

1616
; tm/hm learnset
17-
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
18-
DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
19-
HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
17+
tmhm MEGA_PUNCH, MEGA_KICK, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
18+
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
19+
PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
2020
PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \
21-
BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \
22-
SUBSTITUTE
21+
BIDE, METRONOME, SWIFT, DREAM_EATER, REST, \
22+
PSYWAVE, TRI_ATTACK, SUBSTITUTE
2323
; end
2424

2525
db 0 ; padding

‎data/pokemon/base_stats/lapras.asm‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
db GROWTH_SLOW ; growth rate
1515

1616
; tm/hm learnset
17-
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
18-
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
19-
RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \
20-
PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
21-
SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \
22-
STRENGTH
17+
tmhm HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
18+
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \
19+
SOLARBEAM, DRAGON_RAGE, PSYCHIC_M, REFLECT, BIDE, \
20+
SKULL_BASH, REST, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \
21+
SURF, STRENGTH, FLASH
2322
; end
2423

2524
db 0 ; padding

‎data/pokemon/base_stats/seel.asm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 65, 45, 55, 45, 70
44
; hp atk def spd spc
55

6-
db WATER, WATER ; type
6+
db ICE, ICE ; type
77
db 190 ; catch rate
88
db 100 ; base exp
99

@@ -14,10 +14,10 @@
1414
db GROWTH_MEDIUM_FAST ; growth rate
1515

1616
; tm/hm learnset
17-
tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
18-
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \
19-
RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \
20-
REST, SUBSTITUTE, SURF, STRENGTH
17+
tmhm HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
18+
WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \
19+
MIMIC, BIDE, SKULL_BASH, REST, SUBSTITUTE, \
20+
SURF, STRENGTH
2121
; end
2222

2323
db 0 ; padding

‎data/pokemon/base_stats/shellder.asm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
; tm/hm learnset
1717
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
18-
ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \
19-
DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \
20-
REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF
18+
ICE_BEAM, BLIZZARD, RAGE, DIG, REFLECT, \
19+
BIDE, SELFDESTRUCT, SWIFT, REST, EXPLOSION, \
20+
TRI_ATTACK, SUBSTITUTE, SURF
2121
; end
2222

2323
db 0 ; padding

‎data/pokemon/evos_moves.asm‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,16 @@ LaprasEvosMoves:
407407
; Evolutions
408408
db 0
409409
; Learnset
410-
db 16, SING
411-
db 20, MIST
412-
db 25, BODY_SLAM
413-
db 31, CONFUSE_RAY
414-
db 38, ICE_BEAM
415-
db 46, HYDRO_PUMP
410+
db 8, SING
411+
db 16, POWDER_SNOW
412+
db 20, HEADBUTT
413+
db 24, MIST
414+
db 28, CONFUSE_RAY
415+
db 32, ICE_BEAM
416+
db 36, BODY_SLAM
417+
db 40, HAZE
418+
db 44, HYDRO_PUMP
419+
db 48, BLIZZARD
416420
db 0
417421

418422
ArcanineEvosMoves:
@@ -836,10 +840,15 @@ SeelEvosMoves:
836840
db EV_LEVEL, 34, DEWGONG
837841
db 0
838842
; Learnset
839-
db 30, GROWL
840-
db 35, AURORA_BEAM
841-
db 40, REST
842-
db 45, TAKE_DOWN
843+
db 5, GROWL
844+
db 10, POWDER_SNOW
845+
db 15, WATER_GUN
846+
db 20, BITE
847+
db 25, WITHDRAW
848+
db 30, AURORA_BEAM
849+
db 35, REST
850+
db 40, TAKE_DOWN
851+
db 45, MIST
843852
db 50, ICE_BEAM
844853
db 0
845854

@@ -967,12 +976,17 @@ JynxEvosMoves:
967976
; Evolutions
968977
db 0
969978
; Learnset
970-
db 18, LICK
971-
db 23, DOUBLESLAP
972-
db 31, ICE_PUNCH
973-
db 39, BODY_SLAM
974-
db 47, THRASH
979+
db 12, LICK
980+
db 17, POWDER_SNOW
981+
db 21, DOUBLESLAP
982+
db 28, MIST
983+
db 32, CONFUSION
984+
db 36, ICE_PUNCH
985+
db 41, BODY_SLAM
986+
db 46, LOVELY_KISS
987+
db 52, PSYCHIC
975988
db 58, BLIZZARD
989+
db 63, THRASH
976990
db 0
977991

978992
MoltresEvosMoves:
@@ -1448,10 +1462,15 @@ DewgongEvosMoves:
14481462
; Evolutions
14491463
db 0
14501464
; Learnset
1451-
db 30, GROWL
1452-
db 35, AURORA_BEAM
1453-
db 44, REST
1454-
db 50, TAKE_DOWN
1465+
db 5, GROWL
1466+
db 10, POWDER_SNOW
1467+
db 15, WATER_GUN
1468+
db 20, BITE
1469+
db 26, WITHDRAW
1470+
db 32, AURORA_BEAM
1471+
db 38, REST
1472+
db 44, TAKE_DOWN
1473+
db 50, MIST
14551474
db 56, ICE_BEAM
14561475
db 0
14571476

0 commit comments

Comments
 (0)