Merge branch 'master' of https://github.com/luckytyphlosion/pokered

wrulfy · Jul 27, 2015 · 408f9b3 · 408f9b3
2 parents d7c5c8c + 9048217
commit 408f9b3
Show file tree

Hide file tree

Showing 155 changed files with 1,211 additions and 1,148 deletions.
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -24,11 +24,11 @@ ENDC
 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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,11 @@ 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
diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm
@@ -19,15 +19,15 @@ db 0
 db 0
 db 0 ; growth rate
 ; learnset
-db %00101010
-db %01000011
-db %00111000
-db %11110000
-db %01000011
-db %00101000
+ tmlearn 2,4,6
+ tmlearn 9,10,15
+ tmlearn 20,21,22
+ tmlearn 29,30,31,32
+ tmlearn 33,34,39
+ tmlearn 44,46
 IF DEF(_YELLOW)
- db %01000010
+ tmlearn 50,55
 ELSE
- db %00000010
+ tmlearn 50
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm
@@ -19,11 +19,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
@@ -23,11 +23,11 @@ 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
@@ -19,15 +19,15 @@ db EMBER
 db LEER
 db 3 ; growth rate
 ; learnset
-db %10110101
-db %01000011
-db %01001111
-db %11001110
-db %11100011
-db %00001000
+ 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
 IF DEF(_YELLOW)
- db %00101110
+ tmlearn 50,51,52,54
 ELSE
- db %00100110
+ tmlearn 50,51,54
 ENDC
 db 0 ; padding
diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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
@@ -19,11 +19,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