Merge pull request #539 from Rangi42/master

[RTM] Miscellaneous reorganization fixes

11 files changed, 344 insertions, 345 deletions

diff --git a/data/battle/critical_hits.asm b/data/battle/critical_hit_chances.asm
index 5800d57f4..0128f1a1e 100644
--- a/data/battle/critical_hits.asm
+++ b/data/battle/critical_hit_chances.asm
@@ -1,13 +1,3 @@
-CriticalHitMoves:
-	db KARATE_CHOP
-	db RAZOR_WIND
-	db RAZOR_LEAF
-	db CRABHAMMER
-	db SLASH
-	db AEROBLAST
-	db CROSS_CHOP
-	db -1
-
 CriticalHitChances:
 	db  7 percent     ;  0
 	db 12 percent + 2 ; +1
diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm
index 15b7cdc4e..e0d2b4dec 100644
--- a/data/battle_tower/parties.asm
+++ b/data/battle_tower/parties.asm
@@ -14,7 +14,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 35000
 	bigdw 40000
-	db $dd, $bd ; DVs
+	dn 13, 13, 11, 13 ; DVs
 	db 15, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -40,7 +40,7 @@ BattleTowerMons1:
 	bigdw 35000
 	bigdw 40000
 	bigdw 40000
-	db $ed, $fb ; DVs
+	dn 14, 13, 15, 11 ; DVs
 	db 10, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -66,7 +66,7 @@ BattleTowerMons1:
 	bigdw 45000
 	bigdw 50000
 	bigdw 40000
-	db $db, $ef ; DVs
+	dn 13, 11, 14, 15 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -92,7 +92,7 @@ BattleTowerMons1:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $7f, $d7 ; DVs
+	dn 7, 15, 13, 7 ; DVs
 	db 20, 20, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -118,7 +118,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $cf ; DVs
+	dn 14, 15, 12, 15 ; DVs
 	db 15, 5, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -144,7 +144,7 @@ BattleTowerMons1:
 	bigdw 33300
 	bigdw 30000
 	bigdw 30000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 15, 10, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -170,7 +170,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 35000
-	db $bb, $df ; DVs
+	dn 11, 11, 13, 15 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -196,7 +196,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $db, $fb ; DVs
+	dn 13, 11, 15, 11 ; DVs
 	db 5, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -222,7 +222,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -248,7 +248,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $bf ; DVs
+	dn 15, 11, 11, 15 ; DVs
 	db 20, 20, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -274,7 +274,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $de ; DVs
+	dn 15, 11, 13, 14 ; DVs
 	db 10, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -300,7 +300,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $df ; DVs
+	dn 14, 15, 13, 15 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -326,7 +326,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 33000
 	bigdw 30000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 20, 10, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -352,7 +352,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ed, $fd ; DVs
+	dn 14, 13, 15, 13 ; DVs
 	db 20, 10, 15, 30 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -378,7 +378,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $df, $ce ; DVs
+	dn 13, 15, 12, 14 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -404,7 +404,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 15, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -430,7 +430,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 5, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -456,7 +456,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -482,7 +482,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 15, 0, 0, 0 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -508,7 +508,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $57 ; DVs
+	dn 6, 5, 5, 7 ; DVs
 	db 15, 15, 30, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -534,7 +534,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $73, $67 ; DVs
+	dn 7, 3, 6, 7 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -563,7 +563,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $cf, $bc ; DVs
+	dn 12, 15, 11, 12 ; DVs
 	db 10, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -589,7 +589,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $db ; DVs
+	dn 13, 11, 13, 11 ; DVs
 	db 20, 10, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -615,7 +615,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $fd ; DVs
+	dn 15, 10, 15, 13 ; DVs
 	db 5, 10, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -641,7 +641,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -667,7 +667,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 50000
 	bigdw 40000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 10, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -693,7 +693,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $db, $fb ; DVs
+	dn 13, 11, 15, 11 ; DVs
 	db 15, 20, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -719,7 +719,7 @@ BattleTowerMons2:
 	bigdw 45000
 	bigdw 30000
 	bigdw 45000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -745,7 +745,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -771,7 +771,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $fb, $bb ; DVs
+	dn 15, 11, 11, 11 ; DVs
 	db 10, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -797,7 +797,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 10, 25, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -823,7 +823,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 55000
 	bigdw 30000
-	db $fe, $d7 ; DVs
+	dn 15, 14, 13, 7 ; DVs
 	db 10, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -849,7 +849,7 @@ BattleTowerMons2:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fc, $fe ; DVs
+	dn 15, 12, 15, 14 ; DVs
 	db 15, 20, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -875,7 +875,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 25, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -901,7 +901,7 @@ BattleTowerMons2:
 	bigdw 35000
 	bigdw 50000
 	bigdw 30000
-	db $fb, $fd ; DVs
+	dn 15, 11, 15, 13 ; DVs
 	db 15, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -927,7 +927,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 10, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -953,7 +953,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $ed, $f7 ; DVs
+	dn 14, 13, 15, 7 ; DVs
 	db 15, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -979,7 +979,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $df, $fe ; DVs
+	dn 13, 15, 15, 14 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1005,7 +1005,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $c7, $fe ; DVs
+	dn 12, 7, 15, 14 ; DVs
 	db 5, 5, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1031,7 +1031,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $c7, $77 ; DVs
+	dn 12, 7, 7, 7 ; DVs
 	db 10, 15, 10, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1057,7 +1057,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $56, $46 ; DVs
+	dn 5, 6, 4, 6 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1083,7 +1083,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $55, $47 ; DVs
+	dn 5, 5, 4, 7 ; DVs
 	db 20, 10, 15, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1112,7 +1112,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $db, $ed ; DVs
+	dn 13, 11, 14, 13 ; DVs
 	db 15, 20, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1138,7 +1138,7 @@ BattleTowerMons3:
 	bigdw 55000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fb ; DVs
+	dn 13, 13, 15, 11 ; DVs
 	db 15, 15, 5, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1164,7 +1164,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1190,7 +1190,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fb, $ee ; DVs
+	dn 15, 11, 14, 14 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1216,7 +1216,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $ff ; DVs
+	dn 14, 15, 15, 15 ; DVs
 	db 10, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1242,7 +1242,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 5, 5, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1268,7 +1268,7 @@ BattleTowerMons3:
 	bigdw 45000
 	bigdw 30000
 	bigdw 45000
-	db $fb, $ed ; DVs
+	dn 15, 11, 14, 13 ; DVs
 	db 10, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1294,7 +1294,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1320,7 +1320,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $be ; DVs
+	dn 15, 13, 11, 14 ; DVs
 	db 5, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1346,7 +1346,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 50000
-	db $ef, $dc ; DVs
+	dn 14, 15, 13, 12 ; DVs
 	db 15, 10, 10, 35 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1372,7 +1372,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 55000
 	bigdw 30000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1398,7 +1398,7 @@ BattleTowerMons3:
 	bigdw 45000
 	bigdw 50000
 	bigdw 30000
-	db $dd, $eb ; DVs
+	dn 13, 13, 14, 11 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1424,7 +1424,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 30, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1450,7 +1450,7 @@ BattleTowerMons3:
 	bigdw 35000
 	bigdw 50000
 	bigdw 30000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 25, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1476,7 +1476,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $dd, $eb ; DVs
+	dn 13, 13, 14, 11 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1502,7 +1502,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 25, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1528,7 +1528,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 47000
 	bigdw 45000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 20, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1554,7 +1554,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 10, 30, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1580,7 +1580,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $45 ; DVs
+	dn 7, 7, 4, 5 ; DVs
 	db 15, 10, 20, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1606,7 +1606,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $67, $77 ; DVs
+	dn 6, 7, 7, 7 ; DVs
 	db 20, 20, 35, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1632,7 +1632,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $67 ; DVs
+	dn 7, 7, 6, 7 ; DVs
 	db 20, 25, 15, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1661,7 +1661,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 20, 5, 10, 15 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1687,7 +1687,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 20, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1713,7 +1713,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ed, $dd ; DVs
+	dn 14, 13, 13, 13 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1739,7 +1739,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 15, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1765,7 +1765,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $db ; DVs
+	dn 14, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1791,7 +1791,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 10, 15, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1817,7 +1817,7 @@ BattleTowerMons4:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $be ; DVs
+	dn 15, 13, 11, 14 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1843,7 +1843,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bf, $e7 ; DVs
+	dn 11, 15, 14, 7 ; DVs
 	db 20, 20, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1869,7 +1869,7 @@ BattleTowerMons4:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 5, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1895,7 +1895,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 20, 25, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1921,7 +1921,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $bb ; DVs
+	dn 15, 14, 11, 11 ; DVs
 	db 10, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1947,7 +1947,7 @@ BattleTowerMons4:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $bf, $cf ; DVs
+	dn 11, 15, 12, 15 ; DVs
 	db 15, 10, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1973,7 +1973,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bc, $ef ; DVs
+	dn 11, 12, 14, 15 ; DVs
 	db 30, 30, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1999,7 +1999,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $bb ; DVs
+	dn 15, 14, 11, 11 ; DVs
 	db 25, 30, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2025,7 +2025,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $7f ; DVs
+	dn 15, 10, 7, 15 ; DVs
 	db 40, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2051,7 +2051,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 10, 25, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2077,7 +2077,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2103,7 +2103,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $e7 ; DVs
+	dn 15, 7, 14, 7 ; DVs
 	db 10, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2129,7 +2129,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $7a ; DVs
+	dn 7, 7, 7, 10 ; DVs
 	db 25, 15, 15, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2155,7 +2155,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $75, $6b ; DVs
+	dn 7, 5, 6, 11 ; DVs
 	db 40, 10, 20, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2181,7 +2181,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $77 ; DVs
+	dn 6, 5, 7, 7 ; DVs
 	db 30, 15, 20, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2210,7 +2210,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 50000
 	bigdw 55000
-	db $dd, $ff ; DVs
+	dn 13, 13, 15, 15 ; DVs
 	db 15, 5, 5, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2236,7 +2236,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $dd, $fc ; DVs
+	dn 13, 13, 15, 12 ; DVs
 	db 10, 15, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2262,7 +2262,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 10, 10, 10, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2288,7 +2288,7 @@ BattleTowerMons5:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2314,7 +2314,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 55000
 	bigdw 60000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 15, 15, 10, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2340,7 +2340,7 @@ BattleTowerMons5:
 	bigdw 57000
 	bigdw 55000
 	bigdw 55000
-	db $ed, $ff ; DVs
+	dn 14, 13, 15, 15 ; DVs
 	db 15, 20, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2366,7 +2366,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 5, 20, 30, 35 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2392,7 +2392,7 @@ BattleTowerMons5:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 10, 15, 10, 20 ; PP
 	db 15 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2418,7 +2418,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 44000
-	db $ff, $ec ; DVs
+	dn 15, 15, 14, 12 ; DVs
 	db 5, 10, 5, 15 ; PP
 	db 13 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2444,7 +2444,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 45000
 	bigdw 40000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 20, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2470,7 +2470,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $f7, $fe ; DVs
+	dn 15, 7, 15, 14 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2496,7 +2496,7 @@ BattleTowerMons5:
 	bigdw 54000
 	bigdw 40000
 	bigdw 50000
-	db $7d, $fe ; DVs
+	dn 7, 13, 15, 14 ; DVs
 	db 15, 5, 20, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2522,7 +2522,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 5, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2548,7 +2548,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $ef, $ff ; DVs
+	dn 14, 15, 15, 15 ; DVs
 	db 10, 15, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2574,7 +2574,7 @@ BattleTowerMons5:
 	bigdw 45000
 	bigdw 40000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 20, 15, 20, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2600,7 +2600,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 50000
 	bigdw 40000
-	db $d7, $ed ; DVs
+	dn 13, 7, 14, 13 ; DVs
 	db 10, 15, 25, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2626,7 +2626,7 @@ BattleTowerMons5:
 	bigdw 55000
 	bigdw 45000
 	bigdw 40000
-	db $cf, $dd ; DVs
+	dn 12, 15, 13, 13 ; DVs
 	db 10, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2652,7 +2652,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 45000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2678,7 +2678,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $45, $56 ; DVs
+	dn 4, 5, 5, 6 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2704,7 +2704,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $75, $65 ; DVs
+	dn 7, 5, 6, 5 ; DVs
 	db 5, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2730,7 +2730,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $45, $56 ; DVs
+	dn 4, 5, 5, 6 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2759,7 +2759,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 60000
 	bigdw 60000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 20, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2785,7 +2785,7 @@ BattleTowerMons6:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 10, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2811,7 +2811,7 @@ BattleTowerMons6:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2837,7 +2837,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $dd, $de ; DVs
+	dn 13, 13, 13, 14 ; DVs
 	db 5, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2863,7 +2863,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 5, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2889,7 +2889,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fd ; DVs
+	dn 13, 13, 15, 13 ; DVs
 	db 10, 20, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2915,7 +2915,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 20, 5, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2941,7 +2941,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 5, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2967,7 +2967,7 @@ BattleTowerMons6:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $fd ; DVs
+	dn 13, 13, 15, 13 ; DVs
 	db 5, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2993,7 +2993,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 10, 5, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3019,7 +3019,7 @@ BattleTowerMons6:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3045,7 +3045,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $eb ; DVs
+	dn 15, 11, 14, 11 ; DVs
 	db 25, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3071,7 +3071,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fb, $cd ; DVs
+	dn 15, 11, 12, 13 ; DVs
 	db 10, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3097,7 +3097,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $fc ; DVs
+	dn 15, 10, 15, 12 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3123,7 +3123,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 15, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3149,7 +3149,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ff, $eb ; DVs
+	dn 15, 15, 14, 11 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3175,7 +3175,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 40, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3201,7 +3201,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $fa ; DVs
+	dn 15, 11, 15, 10 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3227,7 +3227,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $b7, $67 ; DVs
+	dn 11, 7, 6, 7 ; DVs
 	db 10, 20, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3253,7 +3253,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $66, $5f ; DVs
+	dn 6, 6, 5, 15 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3279,7 +3279,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 5, 10, 15, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3308,7 +3308,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 50000
 	bigdw 60000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3334,7 +3334,7 @@ BattleTowerMons7:
 	bigdw 60000
 	bigdw 60000
 	bigdw 50000
-	db $bf, $ef ; DVs
+	dn 11, 15, 14, 15 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3360,7 +3360,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 50000
 	bigdw 58000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 20, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3386,7 +3386,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 58000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 20, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3412,7 +3412,7 @@ BattleTowerMons7:
 	bigdw 60000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 10, 10, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3438,7 +3438,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $dd, $cd ; DVs
+	dn 13, 13, 12, 13 ; DVs
 	db 15, 15, 20, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3464,7 +3464,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 10, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3490,7 +3490,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 15, 20, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3516,7 +3516,7 @@ BattleTowerMons7:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 10, 5, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3542,7 +3542,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 20, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3568,7 +3568,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $db, $ef ; DVs
+	dn 13, 11, 14, 15 ; DVs
 	db 15, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3594,7 +3594,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $de, $dd ; DVs
+	dn 13, 14, 13, 13 ; DVs
 	db 10, 15, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3620,7 +3620,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 10, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3646,7 +3646,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $fb ; DVs
+	dn 11, 13, 15, 11 ; DVs
 	db 20, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3672,7 +3672,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3698,7 +3698,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 30, 40, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3724,7 +3724,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3750,7 +3750,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 15, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3776,7 +3776,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $44 ; DVs
+	dn 7, 6, 4, 4 ; DVs
 	db 5, 10, 5, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3802,7 +3802,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $56, $44 ; DVs
+	dn 5, 6, 4, 4 ; DVs
 	db 20, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3828,7 +3828,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $64 ; DVs
+	dn 7, 6, 6, 4 ; DVs
 	db 5, 15, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3857,7 +3857,7 @@ BattleTowerMons8:
 	bigdw 60000
 	bigdw 55000
 	bigdw 55000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 20, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3883,7 +3883,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55500
 	bigdw 60000
-	db $db, $ed ; DVs
+	dn 13, 11, 14, 13 ; DVs
 	db 10, 10, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3909,7 +3909,7 @@ BattleTowerMons8:
 	bigdw 55000
 	bigdw 55000
 	bigdw 55000
-	db $fd, $db ; DVs
+	dn 15, 13, 13, 11 ; DVs
 	db 10, 15, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3935,7 +3935,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 10, 15, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3961,7 +3961,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3987,7 +3987,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4013,7 +4013,7 @@ BattleTowerMons8:
 	bigdw 45000
 	bigdw 55000
 	bigdw 50000
-	db $de, $dd ; DVs
+	dn 13, 14, 13, 13 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4039,7 +4039,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 5, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4065,7 +4065,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $fb, $ed ; DVs
+	dn 15, 11, 14, 13 ; DVs
 	db 10, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4091,7 +4091,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 20, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4117,7 +4117,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4143,7 +4143,7 @@ BattleTowerMons8:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $df, $df ; DVs
+	dn 13, 15, 13, 15 ; DVs
 	db 10, 5, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4169,7 +4169,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $df, $dc ; DVs
+	dn 13, 15, 13, 12 ; DVs
 	db 15, 10, 5, 35 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4195,7 +4195,7 @@ BattleTowerMons8:
 	bigdw 35000
 	bigdw 50000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 25, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4221,7 +4221,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 15, 5, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4247,7 +4247,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $ff, $ed ; DVs
+	dn 15, 15, 14, 13 ; DVs
 	db 5, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4273,7 +4273,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 40000
 	bigdw 50000
-	db $ff, $ef ; DVs
+	dn 15, 15, 14, 15 ; DVs
 	db 15, 5, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4299,7 +4299,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 50000
 	bigdw 40000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 20, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4325,7 +4325,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $65 ; DVs
+	dn 6, 5, 6, 5 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4351,7 +4351,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $74, $64 ; DVs
+	dn 7, 4, 6, 4 ; DVs
 	db 5, 25, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4377,7 +4377,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 20, 15, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4406,7 +4406,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4432,7 +4432,7 @@ BattleTowerMons9:
 	bigdw 56000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 5, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4458,7 +4458,7 @@ BattleTowerMons9:
 	bigdw 60000
 	bigdw 55000
 	bigdw 60000
-	db $df, $dd ; DVs
+	dn 13, 15, 13, 13 ; DVs
 	db 20, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4484,7 +4484,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 5, 5, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4510,7 +4510,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 35, 30, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4536,7 +4536,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 10, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4562,7 +4562,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 50000
 	bigdw 45000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 20, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4588,7 +4588,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 5, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4614,7 +4614,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4640,7 +4640,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 10, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4666,7 +4666,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4692,7 +4692,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 5, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4718,7 +4718,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 45000
 	bigdw 55000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 5, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4744,7 +4744,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 10, 5, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4770,7 +4770,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $fe ; DVs
+	dn 13, 11, 15, 14 ; DVs
 	db 15, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4796,7 +4796,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 10, 25, 10, 20 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4822,7 +4822,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 20, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4848,7 +4848,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 5, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4874,7 +4874,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $47, $57 ; DVs
+	dn 4, 7, 5, 7 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4900,7 +4900,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $76 ; DVs
+	dn 6, 5, 7, 6 ; DVs
 	db 15, 5, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4926,7 +4926,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $54, $44 ; DVs
+	dn 5, 4, 4, 4 ; DVs
 	db 10, 10, 15, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4955,7 +4955,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4981,7 +4981,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5007,7 +5007,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $df, $fe ; DVs
+	dn 13, 15, 15, 14 ; DVs
 	db 15, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5033,7 +5033,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 15, 20, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5059,7 +5059,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5085,7 +5085,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 15, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5111,7 +5111,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 55000
 	bigdw 55000
-	db $fe, $df ; DVs
+	dn 15, 14, 13, 15 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5137,7 +5137,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 20, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5163,7 +5163,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5189,7 +5189,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 60000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 10, 5, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5215,7 +5215,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 20, 25, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5241,7 +5241,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 50000
 	bigdw 55000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5267,7 +5267,7 @@ BattleTowerMons10:
 	bigdw 48000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 20, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5293,7 +5293,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 45000
-	db $fb, $fe ; DVs
+	dn 15, 11, 15, 14 ; DVs
 	db 25, 5, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5319,7 +5319,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5345,7 +5345,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $f7 ; DVs
+	dn 15, 14, 15, 7 ; DVs
 	db 10, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5371,7 +5371,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 10, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5397,7 +5397,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $e7 ; DVs
+	dn 15, 11, 14, 7 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5423,7 +5423,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $74, $46 ; DVs
+	dn 7, 4, 4, 6 ; DVs
 	db 5, 10, 10, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5449,7 +5449,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $67, $76 ; DVs
+	dn 6, 7, 7, 6 ; DVs
 	db 20, 15, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5475,7 +5475,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
diff --git a/data/default_options.asm b/data/default_options.asm
index 991827316..333f7ef02 100644
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -2,7 +2,7 @@ DefaultOptions:
 ; wOptions: med text speed
 	db TEXT_DELAY_MED
 ; wSaveFileExists: no
-	db $00
+	db FALSE
 ; wTextBoxFrame: frame 1
 	db FRAME_1
 ; wTextBoxFlags: use text speed
diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm
index d8a289872..dd3dc3bbf 100644
--- a/data/events/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
@@ -41,7 +41,7 @@ OddEgg1:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $0, $0 ; DVs
+	dn 0, 0, 0, 0 ; DVs
 	db 30, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -55,8 +55,8 @@ OddEgg1:
 	bigdw 8 ; SAtk
 	bigdw 8 ; SDef
 	db "EGG@@@@@@@@"
+OddEgg1End:
 
-OddEgg2:
 	db PICHU
 	db NO_ITEM
 	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
@@ -68,7 +68,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 30, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -120,7 +120,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -172,7 +172,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 15, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -224,7 +224,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 30, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -276,7 +276,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 25, 10, 0, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -328,7 +328,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 30, 30, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -380,7 +380,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 10, 0, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index d15e27ca6..d34b85987 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -1,107 +1,107 @@
 landmark: MACRO
 ; x, y, name
-	db \1, \2
+	db \1 + 8, \2 + 16
 	dw \3
 ENDM
 
 Landmarks:
 ; entries correspond to constants/landmark_constants.asm
-	landmark   0,   0, SpecialMapName
-	landmark 148, 116, NewBarkTownName
-	landmark 136, 116, Route29Name
-	landmark 108, 116, CherrygroveCityName
-	landmark 108,  96, Route30Name
-	landmark 104,  76, Route31Name
-	landmark  92,  76, VioletCityName
-	landmark  93,  74, SproutTowerName
-	landmark  92, 108, Route32Name
-	landmark  84,  92, RuinsOfAlphName
-	landmark  92, 140, UnionCaveName
-	landmark  90, 140, Route33Name
-	landmark  76, 140, AzaleaTownName
-	landmark  78, 138, SlowpokeWellName
-	landmark  60, 136, IlexForestName
-	landmark  60, 128, Route34Name
-	landmark  60, 108, GoldenrodCityName
-	landmark  58, 108, RadioTowerName
-	landmark  60,  92, Route35Name
-	landmark  60,  76, NationalParkName
-	landmark  72,  76, Route36Name
-	landmark  76,  68, Route37Name
-	landmark  76,  60, EcruteakCityName
-	landmark  78,  58, TinTowerName
-	landmark  74,  58, BurnedTowerName
-	landmark  60,  60, Route38Name
-	landmark  44,  64, Route39Name
-	landmark  44,  76, OlivineCityName
-	landmark  46,  78, LighthouseName
-	landmark  36,  72, BattleTowerName
-	landmark  36,  80, Route40Name
-	landmark  36, 108, WhirlIslandsName
-	landmark  36, 116, Route41Name
-	landmark  28, 116, CianwoodCityName
-	landmark 100,  60, Route42Name
-	landmark  92,  60, MtMortarName
-	landmark 116,  60, MahoganyTownName
-	landmark 116,  52, Route43Name
-	landmark 116,  44, LakeOfRageName
-	landmark 128,  60, Route44Name
-	landmark 138,  54, IcePathName
-	landmark 140,  60, BlackthornCityName
-	landmark 140,  52, DragonsDenName
-	landmark 140,  80, Route45Name
-	landmark 120,  88, DarkCaveName
-	landmark 132, 104, Route46Name
-	landmark 156,  84, SilverCaveName
-	landmark  60, 124, PalletTownName
-	landmark  60, 108, Route1Name
-	landmark  60,  92, ViridianCityName
-	landmark  60,  80, Route2Name
-	landmark  60,  68, PewterCityName
-	landmark  72,  68, Route3Name
-	landmark  84,  68, MtMoonName
-	landmark  96,  68, Route4Name
-	landmark 108,  68, CeruleanCityName
-	landmark 108,  60, Route24Name
-	landmark 116,  52, Route25Name
-	landmark 108,  76, Route5Name
-	landmark 116,  92, UndergroundName
-	landmark 108,  92, Route6Name
-	landmark 108, 100, VermilionCityName
-	landmark  96,  76, DiglettsCaveName
-	landmark  96,  84, Route7Name
-	landmark 124,  84, Route8Name
-	landmark 124,  68, Route9Name
-	landmark 140,  68, RockTunnelName
-	landmark 140,  72, Route10Name
-	landmark 140,  76, PowerPlantName
-	landmark 140,  84, LavenderTownName
-	landmark 148,  84, LavRadioTowerName
-	landmark  84,  84, CeladonCityName
-	landmark 108,  84, SaffronCityName
-	landmark 124, 100, Route11Name
-	landmark 140,  96, Route12Name
-	landmark 132, 116, Route13Name
-	landmark 124, 128, Route14Name
-	landmark 112, 132, Route15Name
-	landmark  76,  84, Route16Name
-	landmark  76, 108, Route17Name
-	landmark  88, 132, Route18Name
-	landmark 100, 132, FuchsiaCityName
-	landmark 100, 144, Route19Name
-	landmark  84, 148, Route20Name
-	landmark  76, 148, SeafoamIslandsName
-	landmark  60, 148, CinnabarIslandName
-	landmark  60, 136, Route21Name
-	landmark  44,  84, Route22Name
-	landmark  36,  68, VictoryRoadName
-	landmark  36,  60, Route23Name
-	landmark  36,  52, IndigoPlateauName
-	landmark  36, 108, Route26Name
-	landmark  28, 116, Route27Name
-	landmark  20, 116, TohjoFallsName
-	landmark  28,  84, Route28Name
-	landmark 148, 132, FastShipName
+	dbbw       0,   0, SpecialMapName
+	landmark 140, 100, NewBarkTownName
+	landmark 128, 100, Route29Name
+	landmark 100, 100, CherrygroveCityName
+	landmark 100,  80, Route30Name
+	landmark  96,  60, Route31Name
+	landmark  84,  60, VioletCityName
+	landmark  85,  58, SproutTowerName
+	landmark  84,  92, Route32Name
+	landmark  76,  76, RuinsOfAlphName
+	landmark  84, 124, UnionCaveName
+	landmark  82, 124, Route33Name
+	landmark  68, 124, AzaleaTownName
+	landmark  70, 122, SlowpokeWellName
+	landmark  52, 120, IlexForestName
+	landmark  52, 112, Route34Name
+	landmark  52,  92, GoldenrodCityName
+	landmark  50,  92, RadioTowerName
+	landmark  52,  76, Route35Name
+	landmark  52,  60, NationalParkName
+	landmark  64,  60, Route36Name
+	landmark  68,  52, Route37Name
+	landmark  68,  44, EcruteakCityName
+	landmark  70,  42, TinTowerName
+	landmark  66,  42, BurnedTowerName
+	landmark  52,  44, Route38Name
+	landmark  36,  48, Route39Name
+	landmark  36,  60, OlivineCityName
+	landmark  38,  62, LighthouseName
+	landmark  28,  56, BattleTowerName
+	landmark  28,  64, Route40Name
+	landmark  28,  92, WhirlIslandsName
+	landmark  28, 100, Route41Name
+	landmark  20, 100, CianwoodCityName
+	landmark  92,  44, Route42Name
+	landmark  84,  44, MtMortarName
+	landmark 108,  44, MahoganyTownName
+	landmark 108,  36, Route43Name
+	landmark 108,  28, LakeOfRageName
+	landmark 120,  44, Route44Name
+	landmark 130,  38, IcePathName
+	landmark 132,  44, BlackthornCityName
+	landmark 132,  36, DragonsDenName
+	landmark 132,  64, Route45Name
+	landmark 112,  72, DarkCaveName
+	landmark 124,  88, Route46Name
+	landmark 148,  68, SilverCaveName
+	landmark  52, 108, PalletTownName
+	landmark  52,  92, Route1Name
+	landmark  52,  76, ViridianCityName
+	landmark  52,  64, Route2Name
+	landmark  52,  52, PewterCityName
+	landmark  64,  52, Route3Name
+	landmark  76,  52, MtMoonName
+	landmark  88,  52, Route4Name
+	landmark 100,  52, CeruleanCityName
+	landmark 100,  44, Route24Name
+	landmark 108,  36, Route25Name
+	landmark 100,  60, Route5Name
+	landmark 108,  76, UndergroundName
+	landmark 100,  76, Route6Name
+	landmark 100,  84, VermilionCityName
+	landmark  88,  60, DiglettsCaveName
+	landmark  88,  68, Route7Name
+	landmark 116,  68, Route8Name
+	landmark 116,  52, Route9Name
+	landmark 132,  52, RockTunnelName
+	landmark 132,  56, Route10Name
+	landmark 132,  60, PowerPlantName
+	landmark 132,  68, LavenderTownName
+	landmark 140,  68, LavRadioTowerName
+	landmark  76,  68, CeladonCityName
+	landmark 100,  68, SaffronCityName
+	landmark 116,  84, Route11Name
+	landmark 132,  80, Route12Name
+	landmark 124, 100, Route13Name
+	landmark 116, 112, Route14Name
+	landmark 104, 116, Route15Name
+	landmark  68,  68, Route16Name
+	landmark  68,  92, Route17Name
+	landmark  80, 116, Route18Name
+	landmark  92, 116, FuchsiaCityName
+	landmark  92, 128, Route19Name
+	landmark  76, 132, Route20Name
+	landmark  68, 132, SeafoamIslandsName
+	landmark  52, 132, CinnabarIslandName
+	landmark  52, 120, Route21Name
+	landmark  36,  68, Route22Name
+	landmark  28,  52, VictoryRoadName
+	landmark  28,  44, Route23Name
+	landmark  28,  36, IndigoPlateauName
+	landmark  28,  92, Route26Name
+	landmark  20, 100, Route27Name
+	landmark  12, 100, TohjoFallsName
+	landmark  20,  68, Route28Name
+	landmark 140, 116, FastShipName
 
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index cef14f5ab..95518af3d 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -4738,13 +4738,13 @@ BattleAnim_SludgeBomb_branch_cbc15:
 BattleAnim_Sludge_branch_cbc15:
 BattleAnim_Toxic_branch_cbc15:
 .loop
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 132, 72, $0
 	anim_wait 8
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 116, 72, $0
 	anim_wait 8
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 148, 72, $0
 	anim_wait 8
 	anim_loop 5, .loop
diff --git a/data/moves/critical_hit_moves.asm b/data/moves/critical_hit_moves.asm
new file mode 100644
index 000000000..4a4730574
--- /dev/null
+++ b/data/moves/critical_hit_moves.asm
@@ -0,0 +1,9 @@
+CriticalHitMoves:
+	db KARATE_CHOP
+	db RAZOR_WIND
+	db RAZOR_LEAF
+	db CRABHAMMER
+	db SLASH
+	db AEROBLAST
+	db CROSS_CHOP
+	db -1
diff --git a/data/battle/metronome_exception_moves.asm b/data/moves/metronome_exception_moves.asm
index a5aa44132..a5aa44132 100644
--- a/data/battle/metronome_exception_moves.asm
+++ b/data/moves/metronome_exception_moves.asm
diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm
index 76ca2f0b9..2371c4624 100644
--- a/data/sprites/emotes.asm
+++ b/data/sprites/emotes.asm
@@ -2,20 +2,20 @@ emote: MACRO
 ; graphics pointer, length, starting tile
 	dw \1
 	db \2 tiles, BANK(\1)
-	dw vTiles1 tile \3
+	dw vTiles0 tile \3
 ENDM
 
 Emotes:
 ; entries correspond to EMOTE_* constants
-	emote ShockEmote,     4, $78
-	emote QuestionEmote,  4, $78
-	emote HappyEmote,     4, $78
-	emote SadEmote,       4, $78
-	emote HeartEmote,     4, $78
-	emote BoltEmote,      4, $78
-	emote SleepEmote,     4, $78
-	emote FishEmote,      4, $78
-	emote JumpShadowGFX,  1, $7c
-	emote FishingRodGFX,  2, $7c
-	emote BoulderDustGFX, 2, $7e
-	emote GrassRustleGFX, 1, $7e
+	emote ShockEmote,     4, $f8
+	emote QuestionEmote,  4, $f8
+	emote HappyEmote,     4, $f8
+	emote SadEmote,       4, $f8
+	emote HeartEmote,     4, $f8
+	emote BoltEmote,      4, $f8
+	emote SleepEmote,     4, $f8
+	emote FishEmote,      4, $f8
+	emote JumpShadowGFX,  1, $fc
+	emote FishingRodGFX,  2, $fc
+	emote BoulderDustGFX, 2, $fe
+	emote GrassRustleGFX, 1, $fe
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index a6e867498..c99f7eb29 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -93,7 +93,7 @@ UnknownText_0x1bc14f::
 	line "level @"
 	deciram wCurPartyLevel, 1, 3
 	text "!@"
-	sound_dex_fanfare_50_79
+	sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
 	text_waitbutton
 	db "@@"
 
diff --git a/data/tilesets.asm b/data/tilesets.asm
index b652a01ad..b95c20f40 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -8,7 +8,7 @@ ENDM
 ; Associated data:
 ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
 ; - The *PalMap are defined in gfx/tileset_palette_maps.asm
-; - The *Anim are defined in engine/tileset_anims.asm
+; - The *Anim are defined in engine/tilesets/tileset_anims.asm
 
 Tilesets::
 ; entries correspond to TILESET_* constants