summaryrefslogtreecommitdiff
path: root/data/pokemon
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-29 18:27:55 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-29 18:27:55 -0400
commit22c1315dd51eb90be491b8a7f6a73c5d15127737 (patch)
treef5ea44966cd0f4e1259a30e57013ce6683a3f226 /data/pokemon
parent46961443013b8e0819169a4f3bfd4fedd0d7904a (diff)
Include base data (some Pokémon needed TM/HM flags beyond 57)
Diffstat (limited to 'data/pokemon')
-rw-r--r--data/pokemon/base_stats.asm2
-rw-r--r--data/pokemon/base_stats/beedle.asm2
-rw-r--r--data/pokemon/base_stats/caterpie.asm2
-rw-r--r--data/pokemon/base_stats/cocoon.asm2
-rw-r--r--data/pokemon/base_stats/koiking.asm2
-rw-r--r--data/pokemon/base_stats/metamon.asm2
-rw-r--r--data/pokemon/base_stats/transel.asm2
7 files changed, 7 insertions, 7 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 3e1ef5c..f33b5fb 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -4,7 +4,7 @@ tms1 = 0 ; TM01-TM24 (24)
tms2 = 0 ; TM25-TM48 (24)
tms3 = 0 ; TM49-TM50 + HM01-HM07 (9)
rept _NARG
- if 0 < \1 && \1 <= NUM_TMS_HMS
+ if 0 < \1 && \1 <= (NUM_TMS_HMS + 7) / 8 * 8
if \1 < 24 + 1
tms1 = tms1 | (1 << ((\1) - 1))
elif \1 < 48 + 1
diff --git a/data/pokemon/base_stats/beedle.asm b/data/pokemon/base_stats/beedle.asm
index f6d442c..fbf5dd2 100644
--- a/data/pokemon/base_stats/beedle.asm
+++ b/data/pokemon/base_stats/beedle.asm
@@ -14,5 +14,5 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index 308eb08..03c4a4e 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -14,5 +14,5 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
diff --git a/data/pokemon/base_stats/cocoon.asm b/data/pokemon/base_stats/cocoon.asm
index baa8698..c7b7fec 100644
--- a/data/pokemon/base_stats/cocoon.asm
+++ b/data/pokemon/base_stats/cocoon.asm
@@ -14,5 +14,5 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
diff --git a/data/pokemon/base_stats/koiking.asm b/data/pokemon/base_stats/koiking.asm
index 87f1318..19a4d3b 100644
--- a/data/pokemon/base_stats/koiking.asm
+++ b/data/pokemon/base_stats/koiking.asm
@@ -14,5 +14,5 @@
db GROWTH_SLOW ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
diff --git a/data/pokemon/base_stats/metamon.asm b/data/pokemon/base_stats/metamon.asm
index 7494930..544bc39 100644
--- a/data/pokemon/base_stats/metamon.asm
+++ b/data/pokemon/base_stats/metamon.asm
@@ -14,5 +14,5 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
diff --git a/data/pokemon/base_stats/transel.asm b/data/pokemon/base_stats/transel.asm
index 7393d91..0938f82 100644
--- a/data/pokemon/base_stats/transel.asm
+++ b/data/pokemon/base_stats/transel.asm
@@ -14,5 +14,5 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
- tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57
+ tmhm 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63
; end
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-21 21:10:44 +0000