Skip to content

Commit 41def41

Browse files
committed
Updates Moves and Stats of Pokemon
Numerous edits to Pokemon types and learned moves. Butterfree and Venomoth switched sprites. Dragonite's palette changed to blue. Golduck and Psyduck names switched.
1 parent d089ed9 commit 41def41

39 files changed

+127
-85
lines changed

‎data/moves/moves.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Moves:
7474
move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20
7575
move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20
7676
move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, DRAGON, 90, 5
77-
move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
77+
move PECK, NO_ADDITIONAL_EFFECT, 30, FLYING, 100, 35
7878
move DRILL_PECK, NO_ADDITIONAL_EFFECT, 85, FLYING, 100, 15
7979
move SUBMISSION, RECOIL_EFFECT, 120, FIGHTING, 90, 5
8080
move LOW_KICK, FLINCH_SIDE_EFFECT2, 30, FIGHTING, 100, 35

‎data/pokemon/base_stats/bellsprout.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 50, 75, 35, 40, 70
44
; hp atk def spd spc
55

6-
db GRASS, POISON ; type
6+
db GRASS, GRASS ; type
77
db 255 ; catch rate
88
db 84 ; base exp
99

‎data/pokemon/base_stats/bulbasaur.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 45, 49, 49, 45, 65
44
; hp atk def spd spc
55

6-
db GRASS, POISON ; type
6+
db GRASS, GRASS ; type
77
db 45 ; catch rate
88
db 64 ; base exp
99

‎data/pokemon/base_stats/dodrio.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 60, 110, 70, 100, 60
44
; hp atk def spd spc
55

6-
db NORMAL, FLYING ; type
6+
db FLYING, FLYING ; type
77
db 45 ; catch rate
88
db 158 ; base exp
99

‎data/pokemon/base_stats/doduo.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 35, 85, 45, 75, 35
44
; hp atk def spd spc
55

6-
db NORMAL, FLYING ; type
6+
db FLYING, FLYING ; type
77
db 190 ; catch rate
88
db 96 ; base exp
99

‎data/pokemon/base_stats/electabuzz.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
db DEX_ELECTABUZZ ; pokedex id
22

3-
db 65, 83, 57, 105, 85
3+
db 65, 85, 55, 105, 85
44
; hp atk def spd spc
55

6-
db ELECTRIC, ELECTRIC ; type
6+
db ELECTRIC, FIGHTING ; type
77
db 45 ; catch rate
88
db 156 ; base exp
99

‎data/pokemon/base_stats/farfetchd.asm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
db DEX_FARFETCHD ; pokedex id
22

3-
db 52, 65, 55, 60, 58
3+
db 50, 90, 60, 60, 90
44
; hp atk def spd spc
55

6-
db NORMAL, FLYING ; type
6+
db FLYING, FIGHTING ; type
77
db 45 ; catch rate
88
db 94 ; base exp
99

‎data/pokemon/base_stats/gastly.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 30, 35, 30, 80, 100
44
; hp atk def spd spc
55

6-
db GHOST, POISON ; type
6+
db GHOST, GHOST ; type
77
db 190 ; catch rate
88
db 95 ; base exp
99

‎data/pokemon/base_stats/gengar.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 60, 65, 60, 110, 130
44
; hp atk def spd spc
55

6-
db GHOST, POISON ; type
6+
db GHOST, GHOST ; type
77
db 45 ; catch rate
88
db 190 ; base exp
99

‎data/pokemon/base_stats/geodude.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
db 40, 80, 100, 20, 30
44
; hp atk def spd spc
55

6-
db ROCK, GROUND ; type
6+
db ROCK, ROCK ; type
77
db 255 ; catch rate
88
db 86 ; base exp
99

0 commit comments

Comments
 (0)