diff --git a/battle-e/08-B030.asm b/battle-e/08-B030.asm
index fdd7e68..ebc0b41 100644
--- a/battle-e/08-B030.asm
+++ b/battle-e/08-B030.asm
@@ -1,4 +1,4 @@
 INCLUDE "../macros.asm"
 CLASS EQUS   "pokefan_m"
-TRAINER EQUS "makia"
+TRAINER EQUS "makio"
 INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file
diff --git a/battle-e/trainers/daikichi.asm b/battle-e/trainers/daikichi.asm
index 3d997a4..047ac49 100644
--- a/battle-e/trainers/daikichi.asm
+++ b/battle-e/trainers/daikichi.asm
@@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ダイキチ"8
 	OT_ID 00000, 00000
 
-	Intro_ $0a14, $1034, $020e, $2017, $242c, $100e
+	Intro_EN $0a14, $1034, $020e, $2017, $242c, $100e
 	Win_EN $0801, $0c00, $ffff, $2017, $0607, $100e
 	Loss_EN $0811, $0c00, $ffff, $1400, $0628, $1014
 
diff --git a/battle-e/trainers/danpei.asm b/battle-e/trainers/danpei.asm
index 899ddca..e80bc55 100644
--- a/battle-e/trainers/danpei.asm
+++ b/battle-e/trainers/danpei.asm
@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,31,15,15,15,15, 1
 	PV $0000001C
-	Text_JP "LAIRON"11
+	Text_EN "LAIRON"11
 	Text_JP "コドラ"11
 	Friendship 255
 
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 30,31,14,15,15,14, 0
 	PV $000000E4
-	Text_JP "GRAVELER"11
+	Text_EN "GRAVELER"11
 	Text_JP "ゴローン"11
 	Friendship 255
 
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,31,15,15,15,15, 0
 	PV $0000001C
-	Text_JP "SHELGON"11
+	Text_EN "SHELGON"11
 	Text_JP "コモルー"11
 	Friendship 255
 
diff --git a/battle-e/trainers/fiennes.asm b/battle-e/trainers/fiennes.asm
index a99c1d8..1dc78bf 100644
--- a/battle-e/trainers/fiennes.asm
+++ b/battle-e/trainers/fiennes.asm
@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 15,15,15,31,31,15, 1
 	PV $00000087
-	Text_JP "GIRAFARIG"11
+	Text_EN "GIRAFARIG"11
 	Text_JP "キリンリキ"11
 	Friendship 255
 
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,15,15,15,15,31, 0
 	PV $00000084
-	Text_JP "WOBBUFFET"11
+	Text_EN "WOBBUFFET"11
 	Text_JP "ソーナンス"11
 	Friendship 255
 
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,15,15,31,15,15, 0
 	PV $0000000F
-	Text_JP "TYPHLOSION"11
+	Text_EN "TYPHLOSION"11
 	Text_JP "バクフーン"11
 	Friendship 255
 
diff --git a/battle-e/trainers/fugen.asm b/battle-e/trainers/fugen.asm
index d9c9695..60b0335 100644
--- a/battle-e/trainers/fugen.asm
+++ b/battle-e/trainers/fugen.asm
@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 20,20,20,31,31,20, 0
 	PV $0000001D
-	Text_JP "RAICHU"11
+	Text_EN "RAICHU"11
 	Text_JP "ライチュウ"11
 	Friendship 255
 
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,20,20,31,20,20, 0
 	PV $00000080
-	Text_JP "MEDICHAM"11
+	Text_EN "MEDICHAM"11
 	Text_JP "チャーレム"11
 	Friendship 255
 
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 20,31,20,31,20,20, 0
 	PV $000000E2
-	Text_JP "BLAZIKEN"11
+	Text_EN "BLAZIKEN"11
 	Text_JP "バシャーモ"11
 	Friendship 255
 
diff --git a/battle-e/trainers/fukune.asm b/battle-e/trainers/fukune.asm
index 350084e..8fdc186 100644
--- a/battle-e/trainers/fukune.asm
+++ b/battle-e/trainers/fukune.asm
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,20,20,20,20,31, 0
 	PV $00000016
-	Text_JP "TORKOAL"11
+	Text_EN "TORKOAL"11
 	Text_JP "コータス"11
 	Friendship 255
 
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,20,20,20,20,31, 0
 	PV $00000080
-	Text_JP "SWAMPERT"11
+	Text_EN "SWAMPERT"11
 	Text_JP "ラグラージ"11
 	Friendship 255
 
diff --git a/battle-e/trainers/masaru.asm b/battle-e/trainers/masaru.asm
index c492293..7617b8c 100644
--- a/battle-e/trainers/masaru.asm
+++ b/battle-e/trainers/masaru.asm
@@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "マサル"8
 	OT_ID 00000, 00000
 
-	Intro_JEN $0c11, $0c01, $ffff, $061e, $2808, $0c01
+	Intro_EN $0c11, $0c01, $ffff, $061e, $2808, $0c01
 	Win_EN $0c10, $ffff, $ffff, $0421, $250c, $0c01
 	Loss_EN $0e2c, $1002, $0c03, $061e, $062e, $0c03
 
diff --git a/battle-e/trainers/shigeko.asm b/battle-e/trainers/shigeko.asm
index 937551c..23dedc4 100644
--- a/battle-e/trainers/shigeko.asm
+++ b/battle-e/trainers/shigeko.asm
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 31,31,15,15,15,15, 1
 	PV $000000E0
-	Text_JP "SEEDOT"11
+	Text_EN "SEEDOT"11
 	Text_JP "タネボー"11
 	Friendship 255
 
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
 	OT_ID 00000, 00000
 	IVs 15,15,15,31,31,15, 0
 	PV $00000013
-	Text_JP "PIKACHU"11
+	Text_EN "PIKACHU"11
 	Text_JP "ピカチュウ"11
 	Friendship 255