8 files changed, 9 insertions, 9 deletions
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 3d4c9a4..c959f3d 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 58d5422..ae6acef 100644
--- a/data/pokemon/base_stats/beedle.asm
+++ b/data/pokemon/base_stats/beedle.asm
@@ -14,6 +14,6 @@
 	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 4bd8838..52933fa 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -14,6 +14,6 @@
 	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 c752f01..8b29669 100644
--- a/data/pokemon/base_stats/cocoon.asm
+++ b/data/pokemon/base_stats/cocoon.asm
@@ -14,6 +14,6 @@
 	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 bac9aa3..7951be9 100644
--- a/data/pokemon/base_stats/koiking.asm
+++ b/data/pokemon/base_stats/koiking.asm
@@ -14,6 +14,6 @@
 	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 d7ed14b..3a5c9ca 100644
--- a/data/pokemon/base_stats/metamon.asm
+++ b/data/pokemon/base_stats/metamon.asm
@@ -14,6 +14,6 @@
 	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 297c451..6388ccc 100644
--- a/data/pokemon/base_stats/transel.asm
+++ b/data/pokemon/base_stats/transel.asm
@@ -14,6 +14,6 @@
 	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/main.asm b/main.asm
index 17e2d08..8509203 100644
--- a/main.asm
+++ b/main.asm
@@ -43,8 +43,8 @@ INCLUDE "data/pokemon/dex_order_alpha.asm"
 SECTION "Evolutions and Attacks", ROMX[$6493],BANK[$10]
 INCLUDE "data/pokemon/evos_attacks.asm"
 
-;SECTION "Base Data", ROMX[$4F10],BANK[$14]
-;INCLUDE "data/pokemon/base_stats.asm"
+SECTION "Base Data", ROMX[$4F10],BANK[$14]
+INCLUDE "data/pokemon/base_stats.asm"
 
 INCLUDE "gfx/pokemon/pkmn_pics.asm"