diff options
Diffstat (limited to 'data/baseStats')
151 files changed, 1078 insertions, 1303 deletions
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index 80ee9e06..1a41bb5c 100755..100644 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -1,4 +1,3 @@ -AbraBaseStats: ; 38aa6 (e:4aa6) db DEX_ABRA ; pokedex id db 25 ; base hp db 20 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 75067ad3..874dd57d 100755..100644 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -1,4 +1,3 @@ -AerodactylBaseStats: ; 3934a (e:534a) db DEX_AERODACTYL ; pokedex id db 80 ; base hp db 105 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %01001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 2ee79e6f..c20b6c41 100755..100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -1,4 +1,3 @@ -AlakazamBaseStats: ; 38ade (e:4ade) db DEX_ALAKAZAM ; pokedex id db 55 ; base hp db 50 ; base attack @@ -14,21 +13,16 @@ dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - db KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index bddcab5b..6beee569 100755..100644 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -1,4 +1,3 @@ -ArbokBaseStats: ; 38662 (e:4662) db DEX_ARBOK ; pokedex id db 60 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db POISON_STING db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 065edb6d..2a2dda3b 100755..100644 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -1,4 +1,3 @@ -ArcanineBaseStats: ; 38a36 (e:4a36) db DEX_ARCANINE ; pokedex id db 90 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db LEER db TAKE_DOWN db 5 ; growth rate ; learnset -db %10100000 -db %01000011 -db %01001000 -db %11101000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 28,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index 811bb884..ef791055 100755..100644 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -1,4 +1,3 @@ -ArticunoBaseStats: ; 39382 (e:5382) db DEX_ARTICUNO ; pokedex id db 90 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01111111 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm index 9381a63a..6bf091b8 100755..100644 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -1,4 +1,3 @@ -BeedrillBaseStats: ; 38566 (e:4566) db DEX_BEEDRILL ; pokedex id db 65 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00011000 -db %11000000 -db %11000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index e8b7d97a..1c908bbb 100755..100644 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -1,4 +1,3 @@ -BellsproutBaseStats: ; 38b4e (e:4b4e) db DEX_BELLSPROUT ; pokedex id db 50 ; base hp db 75 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index 1ab81327..eaf18b41 100755..100644 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -1,4 +1,3 @@ -BlastoiseBaseStats: ; 384be (e:44be) db DEX_BLASTOISE ; pokedex id db 79 ; base hp db 83 ; base attack @@ -19,11 +18,11 @@ db BUBBLE db WATER_GUN db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 5bf8a184..7b3567b5 100755..100644 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -1,4 +1,4 @@ -BulbasaurBaseStats: ; 383de (e:43de) +MonBaseStats: db DEX_BULBASAUR ; pokedex id db 45 ; base hp db 49 ; base attack @@ -19,11 +19,12 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding +MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 593d5f78..c0fb5f6c 100755..100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -1,4 +1,3 @@ -ButterfreeBaseStats: ; 38512 (e:4512) db DEX_BUTTERFREE ; pokedex id db 60 ; base hp db 45 ; base attack @@ -19,15 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -IF DEF(_YELLOW) - db %01000010 -ELSE - db %00000010 -ENDC + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm index 0dab990b..d26bc5d9 100755..100644 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -1,4 +1,3 @@ -CaterpieBaseStats: ; 384da (e:44da) db DEX_CATERPIE ; pokedex id db 45 ; base hp db 30 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 130a3d00..434b1c26 100755..100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -1,4 +1,3 @@ -ChanseyBaseStats: ; 3901e (e:501e) db DEX_CHANSEY ; pokedex id db 250 ; base hp db 5 ; base attack @@ -14,20 +13,16 @@ dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 db POUND -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db DOUBLESLAP -ENDC +db DOUBLESLAP db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10110111 -db %00111001 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,37,38,40 + tmlearn 41,44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 5cbecb91..2479a60c 100755..100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -1,4 +1,3 @@ -CharizardBaseStats: ; 3846a (e:446a) db DEX_CHARIZARD ; pokedex id db 78 ; base hp db 84 ; base attack @@ -19,15 +18,11 @@ db EMBER db LEER db 3 ; growth rate ; learnset -db %10110101 -db %01000011 -db %01001111 -db %11001110 -db %11100011 -db %00001000 -IF DEF(_YELLOW) - db %00101110 -ELSE - db %00100110 -ENDC + tmlearn 1,3,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,23 + tmlearn 26,27,28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index c9deed08..ccd53458 100755..100644 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -1,4 +1,3 @@ -CharmanderBaseStats: ; 38432 (e:4432) db DEX_CHARMANDER ; pokedex id db 39 ; base hp db 52 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index 6b2b9ba9..80aa2bca 100755..100644 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -1,4 +1,3 @@ -CharmeleonBaseStats: ; 3844e (e:444e) db DEX_CHARMELEON ; pokedex id db 58 ; base hp db 64 ; base attack @@ -19,11 +18,11 @@ db EMBER db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index 8fee3ec6..17837da4 100755..100644 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -1,4 +1,3 @@ -ClefableBaseStats: ; 387b2 (e:47b2) db DEX_CLEFABLE ; pokedex id db 95 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db MINIMIZE db METRONOME db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index bea2ffec..952391c7 100755..100644 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -1,4 +1,3 @@ -ClefairyBaseStats: ; 38796 (e:4796) db DEX_CLEFAIRY ; pokedex id db 70 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index d57b651a..10f38bdb 100755..100644 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -1,4 +1,3 @@ -CloysterBaseStats: ; 38db6 (e:4db6) db DEX_CLOYSTER ; pokedex id db 50 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db CLAMP db AURORA_BEAM db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index 42bb717c..b1222d98 100755..100644 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -1,4 +1,3 @@ -CuboneBaseStats: ; 38f22 (e:4f22) db DEX_CUBONE ; pokedex id db 50 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index 5246189e..fb0cf2c2 100755..100644 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -1,4 +1,3 @@ -DewgongBaseStats: ; 38d46 (e:4d46) db DEX_DEWGONG ; pokedex id db 90 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db AURORA_BEAM db 0 db 0 ; growth rate ; learnset -db %11100000 -db %11111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 4944572b..8ef6e381 100755..100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -1,4 +1,3 @@ -DiglettBaseStats: ; 3893a (e:493a) db DEX_DIGLETT ; pokedex id db 10 ; base hp db 55 ; base attack @@ -19,15 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index 0a35bf55..90ea4c5e 100755..100644 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -1,4 +1,3 @@ -DittoBaseStats: ; 39232 (e:5232) db DEX_DITTO ; pokedex id db 48 ; base hp db 48 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index b872ba47..99608f48 100755..100644 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -1,4 +1,3 @@ -DodrioBaseStats: ; 38d0e (e:4d0e) db DEX_DODRIO ; pokedex id db 60 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db FURY_ATTACK db 0 db 0 ; growth rate ; learnset -db %10101000 -db %01000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 8070ba33..760c258b 100755..100644 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -1,4 +1,3 @@ -DoduoBaseStats: ; 38cf2 (e:4cf2) db DEX_DODUO ; pokedex id db 35 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101000 -db %00000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 89ff2eef..041300e0 100755..100644 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -1,4 +1,3 @@ -DragonairBaseStats: ; 393f2 (e:53f2) db DEX_DRAGONAIR ; pokedex id db 61 ; base hp db 84 ; base attack @@ -19,11 +18,11 @@ db THUNDER_WAVE db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 3699955b..442275b2 100755..100644 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -1,4 +1,3 @@ -DragoniteBaseStats: ; 3940e (e:540e) db DEX_DRAGONITE ; pokedex id db 91 ; base hp db 134 ; base attack @@ -19,11 +18,11 @@ db THUNDER_WAVE db AGILITY db 5 ; growth rate ; learnset -db %11100010 -db %01111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00110010 + tmlearn 2,6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index 4837e4a5..5fb5c75d 100755..100644 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -1,4 +1,3 @@ -DratiniBaseStats: ; 393d6 (e:53d6) db DEX_DRATINI ; pokedex id db 41 ; base hp db 64 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index dfa591bd..452db1bc 100755..100644 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -1,4 +1,3 @@ -DrowzeeBaseStats: ; 38e42 (e:4e42) db DEX_DROWZEE ; pokedex id db 60 ; base hp db 48 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index 0c4bad3b..c763680f 100755..100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -1,4 +1,3 @@ -DugtrioBaseStats: ; 38956 (e:4956) db DEX_DUGTRIO ; pokedex id db 35 ; base hp db 80 ; base attack @@ -19,15 +18,11 @@ db DIG db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 -IF DEF(_YELLOW) - db %00000110 -ELSE - db %00000010 -ENDC + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 978aa4bb..51e36621 100755..100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -1,4 +1,3 @@ -EeveeBaseStats: ; 3924e (e:524e) db DEX_EEVEE ; pokedex id db 55 ; base hp db 55 ; base attack @@ -14,20 +13,16 @@ dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 79dbcbf5..b029a67c 100755..100644 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -1,4 +1,3 @@ -EkansBaseStats: ; 38646 (e:4646) db DEX_EKANS ; pokedex id db 35 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index ac692436..4b44604e 100755..100644 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -1,4 +1,3 @@ -ElectabuzzBaseStats: ; 3916e (e:516e) db DEX_ELECTABUZZ ; pokedex id db 65 ; base hp db 83 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10001111 -db %11110001 -db %11000111 -db %00111000 -db %01100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,39,40 + tmlearn 44,45,46 + tmlearn 50,54,55 db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index 7ce93e8d..1b292f2f 100755..100644 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -1,4 +1,3 @@ -ElectrodeBaseStats: ; 38ece (e:4ece) db DEX_ELECTRODE ; pokedex id db 60 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db SONICBOOM db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000001 -db %10001000 -db %11100001 -db %11001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39,40 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index ded05789..8503889b 100755..100644 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -1,4 +1,3 @@ -ExeggcuteBaseStats: ; 38eea (e:4eea) db DEX_EXEGGCUTE ; pokedex id db 60 ; base hp db 40 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00001000 -db %11110000 -db %00011011 -db %01101000 -db %00000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index e28fb8c8..4d739430 100755..100644 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -1,4 +1,3 @@ -ExeggutorBaseStats: ; 38f06 (e:4f06) db DEX_EXEGGUTOR ; pokedex id db 95 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01000011 -db %00111000 -db %11110000 -db %00011011 -db %01101000 -db %00100010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 51648c46..2aa7eca0 100755..100644 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -1,5 +1,4 @@ -FarfetchdBaseStats: ; 38cd6 (e:4cd6) -db DEX_FARFETCH_D ; pokedex id +db DEX_FARFETCHD ; pokedex id db 52 ; base hp db 65 ; base attack db 55 ; base defense @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101110 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00001110 + tmlearn 2,3,4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51,52 db 0 ; padding diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 0a5d0c48..4ad88723 100755..100644 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -1,4 +1,3 @@ -FearowBaseStats: ; 3862a (e:462a) db DEX_FEAROW ; pokedex id db 65 ; base hp db 90 ; base attack @@ -19,11 +18,11 @@ db LEER db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index ce4a8f0a..70621a6a 100755..100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -1,4 +1,3 @@ -FlareonBaseStats: ; 392a2 (e:52a2) db DEX_FLAREON ; pokedex id db 65 ; base hp db 130 ; base attack @@ -14,20 +13,16 @@ dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db EMBER db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index ca6c2285..fdcaaa71 100755..100644 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -1,4 +1,3 @@ -GastlyBaseStats: ; 38dd2 (e:4dd2) db DEX_GASTLY ; pokedex id db 30 ; base hp db 35 ; base attack @@ -19,11 +18,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index a5881476..0e3e877c 100755..100644 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -1,4 +1,3 @@ -GengarBaseStats: ; 38e0a (e:4e0a) db DEX_GENGAR ; pokedex id db 60 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10011111 -db %11010001 -db %10001110 -db %01101010 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,35,36,40 + tmlearn 42,44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index 52d3553d..a47a993a 100755..100644 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -1,4 +1,3 @@ -GeodudeBaseStats: ; 38bda (e:4bda) db DEX_GEODUDE ; pokedex id db 40 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm index e2c854d4..f2153e5c 100755..100644 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -1,4 +1,3 @@ -GloomBaseStats: ; 38892 (e:4892) db DEX_GLOOM ; pokedex id db 60 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db STUN_SPORE db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index d89dcb1e..845adf4b 100755..100644 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -1,4 +1,3 @@ -GolbatBaseStats: ; 3885a (e:485a) db DEX_GOLBAT ; pokedex id db 75 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db BITE db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index 17afd3c2..ed3a4fdb 100755..100644 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -1,4 +1,3 @@ -GoldeenBaseStats: ; 390aa (e:50aa) db DEX_GOLDEEN ; pokedex id db 45 ; base hp db 67 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %01100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm index f3797f73..cce89da7 100755..100644 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -1,4 +1,3 @@ -GolduckBaseStats: ; 389c6 (e:49c6) db DEX_GOLDUCK ; pokedex id db 80 ; base hp db 82 ; base attack @@ -19,11 +18,11 @@ db DISABLE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index deebb1d1..28f2a326 100755..100644 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -1,4 +1,3 @@ -GolemBaseStats: ; 38c12 (e:4c12) db DEX_GOLEM ; pokedex id db 80 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 586afc2c..08776ab1 100755..100644 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -1,4 +1,3 @@ -GravelerBaseStats: ; 38bf6 (e:4bf6) db DEX_GRAVELER ; pokedex id db 55 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index dd17fb05..5f7a64a7 100755..100644 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -1,4 +1,3 @@ -GrimerBaseStats: ; 38d62 (e:4d62) db DEX_GRIMER ; pokedex id db 80 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index ec48b605..df305636 100755..100644 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -1,4 +1,3 @@ -GrowlitheBaseStats: ; 38a1a (e:4a1a) db DEX_GROWLITHE ; pokedex id db 55 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00000011 -db %01001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index c9e6dc31..6bfc34a0 100755..100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -1,4 +1,3 @@ -GyaradosBaseStats: ; 391fa (e:51fa) db DEX_GYARADOS ; pokedex id db 95 ; base hp db 125 ; base attack @@ -13,24 +12,17 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 -IF DEF(_YELLOW) -db TACKLE -db 0 -db 0 -db 0 -ELSE db BITE db DRAGON_RAGE db LEER db HYDRO_PUMP -ENDC db 5 ; growth rate ; learnset -db %10100000 -db %01111111 -db %11001000 -db %11000001 -db %10100011 -db %00001000 -db %00110010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index 6ac7db99..bd39eaf4 100755..100644 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -1,4 +1,3 @@ -HaunterBaseStats: ; 38dee (e:4dee) db DEX_HAUNTER ; pokedex id db 45 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 9cb0d566..37021f65 100755..100644 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -1,4 +1,3 @@ -HitmonchanBaseStats: ; 38f76 (e:4f76) db DEX_HITMONCHAN ; pokedex id db 50 ; base hp db 105 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index 126f528b..d16db130 100755..100644 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -1,4 +1,3 @@ -HitmonleeBaseStats: ; 38f5a (e:4f5a) db DEX_HITMONLEE ; pokedex id db 50 ; base hp db 120 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index f59bee0c..01de3ff6 100755..100644 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -1,4 +1,3 @@ -HorseaBaseStats: ; 39072 (e:5072) db DEX_HORSEA ; pokedex id db 30 ; base hp db 40 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 022e3134..4e4959b4 100755..100644 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -1,4 +1,3 @@ -HypnoBaseStats: ; 38e5e (e:4e5e) db DEX_HYPNO ; pokedex id db 85 ; base hp db 73 ; base attack @@ -19,11 +18,11 @@ db DISABLE db CONFUSION db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm index 78aec210..3e19f2a1 100755..100644 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -1,4 +1,3 @@ -IvysaurBaseStats: ; 383fa (e:43fa) db DEX_IVYSAUR ; pokedex id db 60 ; base hp db 62 ; base attack @@ -19,11 +18,11 @@ db LEECH_SEED db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index 0252880f..fac03fc9 100755..100644 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -1,4 +1,3 @@ -JigglypuffBaseStats: ; 38806 (e:4806) db DEX_JIGGLYPUFF ; pokedex id db 115 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index 5dc3532a..b33d6327 100755..100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -1,4 +1,3 @@ -JolteonBaseStats: ; 39286 (e:5286) db DEX_JOLTEON ; pokedex id db 65 ; base hp db 65 ; base attack @@ -14,20 +13,16 @@ dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %10001000 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index 6299f545..e69b87b9 100755..100644 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -1,4 +1,3 @@ -JynxBaseStats: ; 39152 (e:5152) db DEX_JYNX ; pokedex id db 65 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11110000 -db %10000111 -db %00101000 -db %00000010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 8a9899c7..60f3e959 100755..100644 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -1,4 +1,3 @@ -KabutoBaseStats: ; 39312 (e:5312) db DEX_KABUTO ; pokedex id db 30 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 7c80a8c0..dbddab2e 100755..100644 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -1,4 +1,3 @@ -KabutopsBaseStats: ; 3932e (e:532e) db DEX_KABUTOPS ; pokedex id db 60 ; base hp db 115 ; base attack @@ -19,11 +18,11 @@ db ABSORB db 0 db 0 ; growth rate ; learnset -db %10110110 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 2,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 85ee8a35..472cc4c5 100755..100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -1,4 +1,3 @@ -KadabraBaseStats: ; 38ac2 (e:4ac2) db DEX_KADABRA ; pokedex id db 40 ; base hp db 35 ; base attack @@ -14,21 +13,16 @@ dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 db TELEPORT -IF DEF(_YELLOW) - DB KINESIS - db 0 -ELSE - db CONFUSION - db DISABLE -ENDC +db CONFUSION +db DISABLE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm index 62e9c225..ec593f91 100755..100644 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -1,4 +1,3 @@ -KakunaBaseStats: ; 3854a (e:454a) db DEX_KAKUNA ; pokedex id db 45 ; base hp db 25 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 3d30b78a..6dcd1e3c 100755..100644 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -1,4 +1,3 @@ -KangaskhanBaseStats: ; 39056 (e:5056) db DEX_KANGASKHAN ; pokedex id db 105 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 8a5b0f98..8708d5cf 100755..100644 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -1,4 +1,3 @@ -KinglerBaseStats: ; 38e96 (e:4e96) db DEX_KINGLER ; pokedex id db 55 ; base hp db 130 ; base attack @@ -19,11 +18,11 @@ db VICEGRIP db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index d50e5bcf..fced6246 100755..100644 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -1,4 +1,3 @@ -KoffingBaseStats: ; 38fae (e:4fae) db DEX_KOFFING ; pokedex id db 40 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 37bbaa0b..88d690b6 100755..100644 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -1,4 +1,3 @@ -KrabbyBaseStats: ; 38e7a (e:4e7a) db DEX_KRABBY ; pokedex id db 30 ; base hp db 105 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index cd4ea5b1..3a897525 100755..100644 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -1,4 +1,3 @@ -LaprasBaseStats: ; 39216 (e:5216) db DEX_LAPRAS ; pokedex id db 130 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01111111 -db %11101000 -db %11010001 -db %10000011 -db %00101000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,22,23,24 + tmlearn 25,29,31,32 + tmlearn 33,34,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 8ada934e..05020627 100755..100644 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -1,4 +1,3 @@ -LickitungBaseStats: ; 38f92 (e:4f92) db DEX_LICKITUNG ; pokedex id db 90 ; base hp db 55 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110101 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %00001000 -db %00110110 + tmlearn 1,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index 1c10c96e..b461d45a 100755..100644 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -1,4 +1,3 @@ -MachampBaseStats: ; 38b32 (e:4b32) db DEX_MACHAMP ; pokedex id db 90 ; base hp db 130 ; base attack @@ -19,11 +18,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 7b491641..b8a41efd 100755..100644 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -1,4 +1,3 @@ -MachokeBaseStats: ; 38b16 (e:4b16) db DEX_MACHOKE ; pokedex id db 80 ; base hp db 100 ; base attack @@ -19,11 +18,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index c951163f..9ed22dc2 100755..100644 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -1,4 +1,3 @@ -MachopBaseStats: ; 38afa (e:4afa) db DEX_MACHOP ; pokedex id db 70 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index 606bf755..50cc651c 100755..100644 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -1,4 +1,3 @@ -MagikarpBaseStats: ; 391de (e:51de) db DEX_MAGIKARP ; pokedex id db 20 ; base hp db 10 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index a360fe9d..379e91df 100755..100644 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -1,4 +1,3 @@ -MagmarBaseStats: ; 3918a (e:518a) db DEX_MAGMAR ; pokedex id db 65 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10100110 -db %00101000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 34,35,38,40 + tmlearn 44,46 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index 166e2fb0..ce042457 100755..100644 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -1,4 +1,3 @@ -MagnemiteBaseStats: ; 38c9e (e:4c9e) db DEX_MAGNEMITE ; pokedex id db 25 ; base hp db 35 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index 92ae9760..a2890bbd 100755..100644 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -1,4 +1,3 @@ -MagnetonBaseStats: ; 38cba (e:4cba) db DEX_MAGNETON ; pokedex id db 50 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db THUNDERSHOCK db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 13e77c5c..406a1364 100755..100644 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -1,4 +1,3 @@ -MankeyBaseStats: ; 389e2 (e:49e2) db DEX_MANKEY ; pokedex id db 40 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 64bfb0d6..3b90dbb1 100755..100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -1,4 +1,3 @@ -MarowakBaseStats: ; 38f3e (e:4f3e) db DEX_MAROWAK ; pokedex id db 60 ; base hp db 80 ; base attack @@ -14,22 +13,16 @@ dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 db BONE_CLUB -IF DEF(_YELLOW) - db TAIL_WHIP - db 0 - db 0 -ELSE - db GROWL - db LEER - db FOCUS_ENERGY -ENDC +db GROWL +db LEER +db FOCUS_ENERGY db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index dc404d20..dc146cf3 100755..100644 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -1,4 +1,3 @@ -MeowthBaseStats: ; 38972 (e:4972) db DEX_MEOWTH ; pokedex id db 40 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm index 71a2be28..9da351ad 100755..100644 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -1,4 +1,3 @@ -MetapodBaseStats: ; 384f6 (e:44f6) db DEX_METAPOD ; pokedex id db 50 ; base hp db 20 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 16634430..6919fd0e 100755..100644 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -1,4 +1,4 @@ -MewBaseStats: ; 425b (1:425b) +MewBaseStats: db DEX_MEW ; pokedex id db 100 ; base hp db 100 ; base attack @@ -18,12 +18,12 @@ db 0 db 0 db 0 db 3 ; growth rate -; include learnset directly -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 +; learnset + tmlearn 1,2,3,4,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,21,22,23,24 + tmlearn 25,26,27,28,29,30,31,32 + tmlearn 33,34,35,36,37,38,39,40 + tmlearn 41,42,43,44,45,46,47,48 + tmlearn 49,50,51,52,53,54,55,56 db %11111111 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index 29b0b61b..dc597345 100755..100644 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -1,4 +1,3 @@ -MewtwoBaseStats: ; 3942a (e:542a) db DEX_MEWTWO ; pokedex id db 106 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db SWIFT db PSYCHIC_M db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11110001 -db %10101111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index eeeb5367..e9437405 100755..100644 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -1,4 +1,3 @@ -MoltresBaseStats: ; 393ba (e:53ba) db DEX_MOLTRES ; pokedex id db 90 ; base hp db 100 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 93a6fcf7..8640e340 100755..100644 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -1,4 +1,3 @@ -MrMimeBaseStats: ; 3911a (e:511a) db DEX_MR_MIME ; pokedex id db 40 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10101111 -db %11110001 -db %10000111 -db %00111000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 465c6012..cb15563e 100755..100644 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -1,4 +1,3 @@ -MukBaseStats: ; 38d7e (e:4d7e) db DEX_MUK ; pokedex id db 105 ; base hp db 105 ; base attack @@ -19,11 +18,11 @@ db POISON_GAS db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 15 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index c283821b..ebef0965 100755..100644 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -1,4 +1,3 @@ -NidokingBaseStats: ; 3877a (e:477a) db DEX_NIDOKING ; pokedex id db 81 ; base hp db 92 ; base attack @@ -19,11 +18,11 @@ db POISON_STING db THRASH db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 5f3f91a3..9ea29a31 100755..100644 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -1,4 +1,3 @@ -NidoqueenBaseStats: ; 38726 (e:4726) db DEX_NIDOQUEEN ; pokedex id db 90 ; base hp db 82 ; base attack @@ -19,11 +18,11 @@ db TAIL_WHIP db BODY_SLAM db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm index 24caa7ab..67832f18 100755..100644 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -1,4 +1,3 @@ -NidoranFBaseStats: ; 386ee (e:46ee) db DEX_NIDORAN_F ; pokedex id db 55 ; base hp db 47 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm index 1b33b61c..a7882766 100755..100644 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -1,4 +1,3 @@ -NidoranMBaseStats: ; 38742 (e:4742) db DEX_NIDORAN_M ; pokedex id db 46 ; base hp db 57 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm index b2ab3ce8..0ddecf70 100755..100644 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -1,4 +1,3 @@ -NidorinaBaseStats: ; 3870a (e:470a) db DEX_NIDORINA ; pokedex id db 70 ; base hp db 62 ; base attack @@ -19,11 +18,11 @@ db SCRATCH db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm index 06957afd..fc435fc4 100755..100644 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -1,4 +1,3 @@ -NidorinoBaseStats: ; 3875e (e:475e) db DEX_NIDORINO ; pokedex id db 61 ; base hp db 72 ; base attack @@ -19,11 +18,11 @@ db HORN_ATTACK db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetales.asm index 8141b627..e98028dc 100755..100644 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetales.asm @@ -1,4 +1,3 @@ -NinetalesBaseStats: ; 387ea (e:47ea) db DEX_NINETALES ; pokedex id db 73 ; base hp db 76 ; base attack @@ -19,11 +18,11 @@ db QUICK_ATTACK db ROAR db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm index 31e376a6..c91c5138 100755..100644 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -1,4 +1,3 @@ -OddishBaseStats: ; 38876 (e:4876) db DEX_ODDISH ; pokedex id db 45 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index d4b5f534..3c461876 100755..100644 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -1,4 +1,3 @@ -OmanyteBaseStats: ; 392da (e:52da) db DEX_OMANYTE ; pokedex id db 35 ; base hp db 40 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index f39c8f2d..09a2ae77 100755..100644 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -1,4 +1,3 @@ -OmastarBaseStats: ; 392f6 (e:52f6) db DEX_OMASTAR ; pokedex id db 70 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db HORN_ATTACK db 0 db 0 ; growth rate ; learnset -db %11100000 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index ce4375f7..6f3be4df 100755..100644 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -1,4 +1,3 @@ -OnixBaseStats: ; 38e26 (e:4e26) db DEX_ONIX ; pokedex id db 35 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %10001010 -db %11001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34,36,40 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm index c1f9dbdd..2c918e68 100755..100644 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -1,4 +1,3 @@ -ParasBaseStats: ; 388ca (e:48ca) db DEX_PARAS ; pokedex id db 35 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm index e53fec0e..dfa0c73e 100755..100644 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -1,4 +1,3 @@ -ParasectBaseStats: ; 388e6 (e:48e6) db DEX_PARASECT ; pokedex id db 60 ; base hp db 95 ; base attack @@ -19,11 +18,11 @@ db LEECH_LIFE db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index c72ac802..2f5ef125 100755..100644 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -1,4 +1,3 @@ -PersianBaseStats: ; 3898e (e:498e) db DEX_PERSIAN ; pokedex id db 65 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db BITE db SCREECH db 0 ; growth rate ; learnset -db %10100000 -db %11001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,15,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index 47fafc3e..05350d07 100755..100644 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -1,4 +1,3 @@ -PidgeotBaseStats: ; 385ba (e:45ba) db DEX_PIDGEOT ; pokedex id db 83 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db QUICK_ATTACK db 0 db 3 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index c996b671..74440fcc 100755..100644 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -1,4 +1,3 @@ -PidgeottoBaseStats: ; 3859e (e:459e) db DEX_PIDGEOTTO ; pokedex id db 63 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index 21259582..ec032d6b 100755..100644 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -1,4 +1,3 @@ -PidgeyBaseStats: ; 38582 (e:4582) db DEX_PIDGEY ; pokedex id db 40 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm index f3b224c8..09971b79 100755..100644 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -1,4 +1,3 @@ -PikachuBaseStats: ; 3867e (e:467e) db DEX_PIKACHU ; pokedex id db 35 ; base hp db 55 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index d9c73ea0..08c0e95a 100755..100644 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -1,4 +1,3 @@ -PinsirBaseStats: ; 391a6 (e:51a6) db DEX_PINSIR ; pokedex id db 65 ; base hp db 125 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11000000 -db %00000010 -db %00001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 6be8587d..8014811e 100755..100644 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -1,4 +1,3 @@ -PoliwagBaseStats: ; 38a52 (e:4a52) db DEX_POLIWAG ; pokedex id db 40 ; base hp db 50 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11010000 -db %10000010 -db %00101000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 29,31,32 + tmlearn 34,40 + tmlearn 44,46 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index b59d6415..6209da68 100755..100644 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -1,4 +1,3 @@ -PoliwhirlBaseStats: ; 38a6e (e:4a6e) db DEX_POLIWHIRL ; pokedex id db 65 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db WATER_GUN db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index d326a909..9489a6a3 100755..100644 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -1,4 +1,3 @@ -PoliwrathBaseStats: ; 38a8a (e:4a8a) db DEX_POLIWRATH ; pokedex id db 90 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db DOUBLESLAP db BODY_SLAM db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index 3f22d6dd..a6ff9e4b 100755..100644 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -1,4 +1,3 @@ -PonytaBaseStats: ; 38c2e (e:4c2e) db DEX_PONYTA ; pokedex id db 50 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %00000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index 0c8a6b33..a049fa7f 100755..100644 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -1,4 +1,3 @@ -PorygonBaseStats: ; 392be (e:52be) db DEX_PORYGON ; pokedex id db 65 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db CONVERSION db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01110011 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01000011 + tmlearn 6 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index eeab800b..659edefd 100755..100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -1,4 +1,3 @@ -PrimeapeBaseStats: ; 389fe (e:49fe) db DEX_PRIMEAPE ; pokedex id db 65 ; base hp db 105 ; base attack @@ -14,21 +13,16 @@ dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -IF !DEF(_YELLOW) - db LEER -ENDC +db LEER db KARATE_CHOP db FURY_SWIPES -IF DEF(_YELLOW) - db LOW_KICK -ENDC db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index bc435c57..db3ac79f 100755..100644 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -1,4 +1,3 @@ -PsyduckBaseStats: ; 389aa (e:49aa) db DEX_PSYDUCK ; pokedex id db 50 ; base hp db 52 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm index 6324d57d..c830483c 100755..100644 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -1,4 +1,3 @@ -RaichuBaseStats: ; 3869a (e:469a) db DEX_RAICHU ; pokedex id db 60 ; base hp db 90 ; base attack @@ -19,11 +18,11 @@ db THUNDER_WAVE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index f5088b6e..c452159e 100755..100644 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -1,4 +1,3 @@ -RapidashBaseStats: ; 38c4a (e:4c4a) db DEX_RAPIDASH ; pokedex id db 65 ; base hp db 100 ; base attack @@ -19,11 +18,11 @@ db STOMP db GROWL db 0 ; growth rate ; learnset -db %11100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index 1bc92090..ff8373d5 100755..100644 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -1,4 +1,3 @@ -RaticateBaseStats: ; 385f2 (e:45f2) db DEX_RATICATE ; pokedex id db 55 ; base hp db 81 ; base attack @@ -19,11 +18,11 @@ db QUICK_ATTACK db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index 192f8f26..7edfb626 100755..100644 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -1,4 +1,3 @@ -RattataBaseStats: ; 385d6 (e:45d6) db DEX_RATTATA ; pokedex id db 30 ; base hp db 56 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00101111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,14 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index 9f005b84..d7066906 100755..100644 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -1,4 +1,3 @@ -RhydonBaseStats: ; 39002 (e:5002) db DEX_RHYDON ; pokedex id db 105 ; base hp db 130 ; base attack @@ -19,11 +18,11 @@ db TAIL_WHIP db FURY_ATTACK db 5 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11001111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index 5521f37a..a6491bd5 100755..100644 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -1,4 +1,3 @@ -RhyhornBaseStats: ; 38fe6 (e:4fe6) db DEX_RHYHORN ; pokedex id db 80 ; base hp db 85 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00000011 -db %10001000 -db %11001111 -db %10100010 -db %10001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index 28016ab9..a9875a8e 100755..100644 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -1,4 +1,3 @@ -SandshrewBaseStats: ; 386b6 (e:46b6) db DEX_SANDSHREW ; pokedex id db 50 ; base hp db 75 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index f613a517..30477eb4 100755..100644 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -1,4 +1,3 @@ -SandslashBaseStats: ; 386d2 (e:46d2) db DEX_SANDSLASH ; pokedex id db 75 ; base hp db 100 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index 6e20cddc..13de0d2b 100755..100644 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -1,4 +1,3 @@ -ScytherBaseStats: ; 39136 (e:5136) db DEX_SCYTHER ; pokedex id db 70 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index 67cc26e1..9f28001b 100755..100644 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -1,4 +1,3 @@ -SeadraBaseStats: ; 3908e (e:508e) db DEX_SEADRA ; pokedex id db 55 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index c122d946..d4fbe8ea 100755..100644 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -1,4 +1,3 @@ -SeakingBaseStats: ; 390c6 (e:50c6) db DEX_SEAKING ; pokedex id db 80 ; base hp db 92 ; base attack @@ -19,11 +18,11 @@ db SUPERSONIC db 0 db 0 ; growth rate ; learnset -db %01100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index 63a57b98..ef9c2898 100755..100644 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -1,4 +1,3 @@ -SeelBaseStats: ; 38d2a (e:4d2a) db DEX_SEEL ; pokedex id db 65 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %10111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index 06525091..7c2cdf9d 100755..100644 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -1,4 +1,3 @@ -ShellderBaseStats: ; 38d9a (e:4d9a) db DEX_SHELLDER ; pokedex id db 30 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index dd271485..ffeda79e 100755..100644 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -1,4 +1,3 @@ -SlowbroBaseStats: ; 38c82 (e:4c82) db DEX_SLOWBRO ; pokedex id db 95 ; base hp db 75 ; base attack @@ -19,11 +18,11 @@ db HEADBUTT db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index 41e0a586..ea238a6e 100755..100644 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -1,4 +1,3 @@ -SlowpokeBaseStats: ; 38c66 (e:4c66) db DEX_SLOWPOKE ; pokedex id db 90 ; base hp db 65 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10111111 -db %00001000 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index 0ada7fa3..2d1fd6e3 100755..100644 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -1,4 +1,3 @@ -SnorlaxBaseStats: ; 39366 (e:5366) db DEX_SNORLAX ; pokedex id db 160 ; base hp db 110 ; base attack @@ -19,11 +18,11 @@ db REST db 0 db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11010111 -db %10101111 -db %10101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,26,27,29,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,46,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index 818ec039..eb8ab1ec 100755..100644 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -1,4 +1,3 @@ -SpearowBaseStats: ; 3860e (e:460e) db DEX_SPEAROW ; pokedex id db 40 ; base hp db 60 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index d79a79e3..f8dcd0a1 100755..100644 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -1,4 +1,3 @@ -SquirtleBaseStats: ; 38486 (e:4486) db DEX_SQUIRTLE ; pokedex id db 44 ; base hp db 48 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index 671666cc..686dfa57 100755..100644 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -1,4 +1,3 @@ -StarmieBaseStats: ; 390fe (e:50fe) db DEX_STARMIE ; pokedex id db 60 ; base hp db 75 ; base attack @@ -19,11 +18,11 @@ db HARDEN db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index 031fe9f5..35f51a6a 100755..100644 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -1,4 +1,3 @@ -StaryuBaseStats: ; 390e2 (e:50e2) db DEX_STARYU ; pokedex id db 30 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index 3e899c05..b50a57bc 100755..100644 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -1,4 +1,3 @@ -TangelaBaseStats: ; 3903a (e:503a) db DEX_TANGELA ; pokedex id db 65 ; base hp db 55 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %10000010 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 16020b09..87f28ec6 100755..100644 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -1,4 +1,3 @@ -TaurosBaseStats: ; 391c2 (e:51c2) db DEX_TAUROS ; pokedex id db 75 ; base hp db 100 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01110011 -db %10001000 -db %11000111 -db %10100010 -db %00001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index f7569d65..7237f083 100755..100644 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -1,4 +1,3 @@ -TentacoolBaseStats: ; 38ba2 (e:4ba2) db DEX_TENTACOOL ; pokedex id db 40 ; base hp db 40 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100100 -db %00111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index d7115059..d3d93919 100755..100644 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -1,4 +1,3 @@ -TentacruelBaseStats: ; 38bbe (e:4bbe) db DEX_TENTACRUEL ; pokedex id db 80 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db WRAP db 0 db 5 ; growth rate ; learnset -db %00100100 -db %01111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index ed4b7a1e..e22b3185 100755..100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -1,4 +1,3 @@ -VaporeonBaseStats: ; 3926a (e:526a) db DEX_VAPOREON ; pokedex id db 130 ; base hp db 65 ; base attack @@ -14,20 +13,16 @@ dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 db TACKLE -IF DEF(_YELLOW) - db TAIL_WHIP -ELSE - db SAND_ATTACK -ENDC +db SAND_ATTACK db QUICK_ATTACK db WATER_GUN db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index f38be71c..7a5bd981 100755..100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -1,4 +1,3 @@ -VenomothBaseStats: ; 3891e (e:491e) db DEX_VENOMOTH ; pokedex id db 70 ; base hp db 65 ; base attack @@ -15,20 +14,15 @@ dw VenomothPicBack ; attacks known at lvl 0 db TACKLE db DISABLE -IF DEF(_YELLOW) - db SUPERSONIC - db CONFUSION -ELSE - db POISONPOWDER - db LEECH_LIFE -ENDC +db POISONPOWDER +db LEECH_LIFE db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 62e8aaef..aeadc6cd 100755..100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -1,4 +1,3 @@ -VenonatBaseStats: ; 38902 (e:4902) db DEX_VENONAT ; pokedex id db 60 ; base hp db 55 ; base attack @@ -19,19 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00111000 -IF DEF(_YELLOW) - db %11110000 - db %01000011 - db %00101000 - db %00100010 -ELSE - db %11010000 - db %00000011 - db %00101000 - db %00000010 -ENDC - + tmlearn 6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 29,31,32 + tmlearn 33,34 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 426d18ac..0a457321 100755..100644 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -1,4 +1,3 @@ -VenusaurBaseStats: ; 38416 (e:4416) db DEX_VENUSAUR ; pokedex id db 80 ; base hp db 82 ; base attack @@ -19,11 +18,11 @@ db LEECH_SEED db VINE_WHIP db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 4f544b8d..7a82c86e 100755..100644 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -1,5 +1,4 @@ -VictreebelBaseStats: ; 38b86 (e:4b86) -db DEX_VICTREEBEL ; pokedex id +db DEX_VICTREEBEL ; pokedex id db 80 ; base hp db 105 ; base attack db 65 ; base defense @@ -19,11 +18,11 @@ db ACID db RAZOR_LEAF db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm index df44be35..17bb9739 100755..100644 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -1,4 +1,3 @@ -VileplumeBaseStats: ; 388ae (e:48ae) db DEX_VILEPLUME ; pokedex id db 75 ; base hp db 80 ; base attack @@ -19,11 +18,11 @@ db ACID db PETAL_DANCE db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index f85fc165..92d2ccb3 100755..100644 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -1,4 +1,3 @@ -VoltorbBaseStats: ; 38eb2 (e:4eb2) db DEX_VOLTORB ; pokedex id db 40 ; base hp db 30 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000001 -db %10001000 -db %11100001 -db %01001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 5b9bc47c..9577ae30 100755..100644 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -1,4 +1,3 @@ -VulpixBaseStats: ; 387ce (e:47ce) db DEX_VULPIX ; pokedex id db 38 ; base hp db 41 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index 4d77ea7b..bc86bd6f 100755..100644 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -1,4 +1,3 @@ -WartortleBaseStats: ; 384a2 (e:44a2) db DEX_WARTORTLE ; pokedex id db 59 ; base hp db 63 ; base attack @@ -19,11 +18,11 @@ db BUBBLE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm index 8e501f0b..8370dc41 100755..100644 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -1,4 +1,3 @@ -WeedleBaseStats: ; 3852e (e:452e) db DEX_WEEDLE ; pokedex id db 40 ; base hp db 35 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 1a974e20..735a453f 100755..100644 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -1,4 +1,3 @@ -WeepinbellBaseStats: ; 38b6a (e:4b6a) db DEX_WEEPINBELL ; pokedex id db 65 ; base hp db 90 ; base attack @@ -19,11 +18,11 @@ db WRAP db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index bd526ecb..0dd09dfe 100755..100644 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -1,4 +1,3 @@ -WeezingBaseStats: ; 38fca (e:4fca) db DEX_WEEZING ; pokedex id db 65 ; base hp db 90 ; base attack @@ -19,11 +18,11 @@ db SLUDGE db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index 1a403c3e..d5fd08e2 100755..100644 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -1,4 +1,3 @@ -WigglytuffBaseStats: ; 38822 (e:4822) db DEX_WIGGLYTUFF ; pokedex id db 140 ; base hp db 70 ; base attack @@ -19,11 +18,11 @@ db DEFENSE_CURL db DOUBLESLAP db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 257bb859..487052ba 100755..100644 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -1,4 +1,3 @@ -ZapdosBaseStats: ; 3939e (e:539e) db DEX_ZAPDOS ; pokedex id db 90 ; base hp db 90 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %10001000 -db %11000001 -db %01000011 -db %00011100 -db %01001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39 + tmlearn 43,44,45 + tmlearn 50,52,55 db 0 ; padding diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index b2197c13..1caa4259 100755..100644 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -1,4 +1,3 @@ -ZubatBaseStats: ; 3883e (e:483e) db DEX_ZUBAT ; pokedex id db 40 ; base hp db 45 ; base attack @@ -19,11 +18,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding |