Update for pokeemerald-expansion

battle-e/berries/macros.asm

@@ -4,7 +4,7 @@ Enigma_Berry: MACRO
 	Section "berry",ROM0[$100]
 	db $01
 	dd $02000000
-	db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0
+	db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0
 	db $07
 	dd $02000018
 	db $02,$00

battle-e/enigmaberry.asm

@@ -37,14 +37,14 @@ BerrySpriteData:
 	db $06,$06,$01,$01,$01,$01,$01
 
 Instructions1: ; B65
-	db "Link e-Reader to Pokémon Ruby or \n"
-	db "Sapphire and select MYSTERY EVENTS\n"
-	db "on the game's main menu.\n"
+	db "Link e-Reader to Pokémon Emerald\n"
+	db "and select MYSTERY EVENTS on the\n"
+	db "game's main menu.\n"
 	db "Press the B Button to cancel.\0"
 Instructions2: ; BE1
 	db "Press the A Button on the Game Boy\n"
-	db "Advance containing Pokémon Ruby or\n"
-	db "Sapphire to send a BERRY.\0"
+	db "Advance containing Pokémon Emerald\n"
+	db "to send a BERRY.\0"
 BerrySendingInProcess: ; C41
 	db "BERRY sending in Process...\0"
 ABerryWasSent: ; C5D

battle-e/trainers/alana.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サニーゴ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/annie.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "カメックス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/anthony.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon ALAKAZAM
 	Holds LUM_BERRY
-	Moves CALM_MIND, PSYCHIC, REFLECT, THUNDERPUNCH
+	Moves CALM_MIND, PSYCHIC, REFLECT, THUNDER_PUNCH
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 6,0,0,252,252,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヌケニン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/antonio.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヘルガー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/april.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon BELLOSSOM
 	Holds MENTAL_HERB
-	Moves SWEET_SCENT, SOLARBEAM, STUN_SPORE, MOONLIGHT
+	Moves SWEET_SCENT, SOLAR_BEAM, STUN_SPORE, MOONLIGHT
 	Level 72
 	PP_Ups 0,0,0,0
 	EVs 252,0,252,0,0,6
@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon TROPIUS
 	Holds WHITE_HERB
-	Moves SWEET_SCENT, SOLARBEAM, BODY_SLAM, STEEL_WING
+	Moves SWEET_SCENT, SOLAR_BEAM, BODY_SLAM, STEEL_WING
 	Level 74
 	PP_Ups 0,0,0,0
 	EVs 252,0,252,0,0,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "トロピウス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/astrid.asm

@@ -14,7 +14,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon MAWILE
 	Holds SITRUS_BERRY
-	Moves IRON_DEFENSE, BITE, VICEGRIP, FAKE_TEARS
+	Moves IRON_DEFENSE, BITE, VISE_GRIP, FAKE_TEARS
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 255,0,255,0,0,0
@@ -38,7 +38,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHIFTRY
 	Holds LEFTOVERS
-	Moves SUNNY_DAY, SOLARBEAM, SWAGGER, FAINT_ATTACK
+	Moves SUNNY_DAY, SOLAR_BEAM, SWAGGER, FEINT_ATTACK
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 170,0,0,170,170,0
@@ -48,40 +48,4 @@ INCLUDE "trainers/macros.asm"
 	Text_EN "SHIFTRY"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/belford.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レジスチル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/bryce.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ナマズン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/candice.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヨマワル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/celina.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SABLEYE
 	Holds SPELL_TAG
-	Moves FAINT_ATTACK, SHADOW_BALL, TOXIC, PROTECT
+	Moves FEINT_ATTACK, SHADOW_BALL, TOXIC, PROTECT
 	Level 62
 	PP_Ups 0,0,0,0
 	EVs 252,0,252,0,0,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヌケニン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/chisa.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ピチュー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/clayton.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ラグラージ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/daikichi.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "キリンリキ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/danpei.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "コモルー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/devin.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "メタグロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/dominic.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バクオング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/dustin.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "マッスグマ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/ellie.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "チリーン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/fay.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レジアイス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/fiennes.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バクフーン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/fuego.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レジロック"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/fugen.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon MEDICHAM
 	Holds LUM_BERRY
-	Moves REVERSAL, HI_JUMP_KICK, ICE_PUNCH, PSYCHIC
+	Moves REVERSAL, HIGH_JUMP_KICK, ICE_PUNCH, PSYCHIC
 	Level 100
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,252,0,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バシャーモ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/fukune.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ラグラージ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/goro.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon NINJASK
 	Holds KINGS_ROCK
-	Moves SILVER_WIND, AERIAL_ACE, FAINT_ATTACK, SHADOW_BALL
+	Moves SILVER_WIND, AERIAL_ACE, FEINT_ATTACK, SHADOW_BALL
 	Level 52
 	PP_Ups 0,0,0,0
 	EVs 0,255,0,255,0,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "クロバット"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/griffin.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サマヨール"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/harue.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サクラビス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/hayden.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHIFTRY
 	Holds FOCUS_BAND
-	Moves EXPLOSION, FAINT_ATTACK, PROTECT, TOXIC
+	Moves EXPLOSION, FEINT_ATTACK, PROTECT, TOXIC
 	Level 84
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,252,6,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ダーテング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/heather.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ソーナンス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/hillary.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon XATU
 	Holds TWISTED_SPOON
-	Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLARBEAM
+	Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLAR_BEAM
 	Level 54
 	PP_Ups 0,0,0,0
 	EVs 0,0,0,255,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヘルガー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/hoyoshi.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ミロカロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/hugo.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ブーピッグ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/ihara.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHIFTRY
 	Holds BRIGHT_POWDER
-	Moves SWAGGER, EXTRASENSORY, FAINT_ATTACK, GROWTH
+	Moves SWAGGER, EXTRASENSORY, FEINT_ATTACK, GROWTH
 	Level 100
 	PP_Ups 0,0,0,0
 	EVs 6,0,0,252,252,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ケッキング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/irazu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レジスチル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/irvin.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon MASQUERAIN
 	Holds LAX_INCENSE
-	Moves SILVER_WIND, SOLARBEAM, ICE_BEAM, STUN_SPORE
+	Moves SILVER_WIND, SOLAR_BEAM, ICE_BEAM, STUN_SPORE
 	Level 91
 	PP_Ups 0,0,0,0
 	EVs 0,255,0,0,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "アメモース"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/jeffrey.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "カメックス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/jo.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SOLROCK
 	Holds WHITE_HERB
-	Moves SUNNY_DAY, SOLARBEAM, FLAMETHROWER, EXPLOSION
+	Moves SUNNY_DAY, SOLAR_BEAM, FLAMETHROWER, EXPLOSION
 	Level 58
 	PP_Ups 0,0,0,0
 	EVs 252,0,6,0,0,252
@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHIFTRY
 	Holds 
-	Moves SUNNY_DAY, SOLARBEAM, GIGA_DRAIN, THIEF
+	Moves SUNNY_DAY, SOLAR_BEAM, GIGA_DRAIN, THIEF
 	Level 60
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,0,252,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バクーダ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/judith.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "マッスグマ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/junji.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SPINDA
 	Holds PERSIM_BERRY
-	Moves TEETER_DANCE, DIZZY_PUNCH, HYPNOSIS, FAINT_ATTACK
+	Moves TEETER_DANCE, DIZZY_PUNCH, HYPNOSIS, FEINT_ATTACK
 	Level 88
 	PP_Ups 0,0,0,0
 	EVs 252,6,252,0,0,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "パッチール"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/junpei.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon KINGDRA
 	Holds BLACK_GLASSES
-	Moves DRAGONBREATH, SURF, ICE_BEAM, HIDDEN_POWER
+	Moves DRAGON_BREATH, SURF, ICE_BEAM, HIDDEN_POWER
 	Level 54
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,0,252,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "キングドラ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/justine.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ゲンガー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/kendall.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ユキワラシ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/kiyoshi.asm

@@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHIFTRY
 	Holds LEFTOVERS
-	Moves EXTRASENSORY, BRICK_BREAK, GIGA_DRAIN, FAINT_ATTACK
+	Moves EXTRASENSORY, BRICK_BREAK, GIGA_DRAIN, FEINT_ATTACK
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 6,0,0,252,252,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バクオング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/koto.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ダグトリオ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/kuen.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ジュカイン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/kyohei.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon ROSELIA
 	Holds POISON_BARB
-	Moves SLUDGE_BOMB, GIGA_DRAIN, GRASSWHISTLE, SYNTHESIS
+	Moves SLUDGE_BOMB, GIGA_DRAIN, GRASS_WHISTLE, SYNTHESIS
 	Level 58
 	PP_Ups 0,0,0,0
 	EVs 0,255,0,0,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ロゼリア"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/logan.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ジーランス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/macros.asm

@@ -13,7 +13,7 @@ Battle_Trainer: MACRO
 	Section "battle",ROM0[$100]
 	db $01
 	dd $02000000
-	db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0
+	db REGION,0,REGION,0,0,0,$04,0,$00,$02,0,0
 	db $0D
 	dd $02000018
 	db $02,$00

battle-e/trainers/maggie.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ピカチュウ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/makio.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ダーテング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/mami.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ミロカロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/mandy.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ケッキング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/marcus.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ラグラージ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/masaru.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon MEDICHAM
 	Holds BLACK_BELT
-	Moves DETECT, RECOVER, HI_JUMP_KICK, PSYCHIC
+	Moves DETECT, RECOVER, HIGH_JUMP_KICK, PSYCHIC
 	Level 52
 	PP_Ups 0,0,0,0
 	EVs 0,255,0,0,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヘラクロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/matsuo.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "マリル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/miyoko.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon CACTURNE
 	Holds SHELL_BELL
-	Moves LEECH_SEED, FAINT_ATTACK, COUNTER, NEEDLE_ARM
+	Moves LEECH_SEED, FEINT_ATTACK, COUNTER, NEEDLE_ARM
 	Level 55
 	PP_Ups 0,0,0,0
 	EVs 255,255,0,0,0,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ジュカイン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/moet.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サーナイト"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/momoko.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サマヨール"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/natalie.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SHELGON
 	Holds SITRUS_BERRY
-	Moves DRAGONBREATH, EMBER, BITE, THRASH
+	Moves DRAGON_BREATH, EMBER, BITE, THRASH
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 255,0,0,0,0,255
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "コモルー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/natasha.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ジュカイン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/natsuko.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ジーランス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/nils.asm

@@ -48,40 +48,4 @@ INCLUDE "trainers/macros.asm"
 	Text_EN "LUDICOLO"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/noriko.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ボーマンダ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/nozomu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ケンタロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/oscar.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ゲンガー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/otoya.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "エアームド"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/patrick.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "フライゴン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/raquel.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バシャーモ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/reina.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "トロピウス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/renee.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon CASTFORM
 	Holds PETAYA_BERRY
-	Moves WEATHER_BALL, SOLARBEAM, SUNNY_DAY, FLAMETHROWER
+	Moves WEATHER_BALL, SOLAR_BEAM, SUNNY_DAY, FLAMETHROWER
 	Level 72
 	PP_Ups 0,0,0,0
 	EVs 0,0,0,255,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ポワルン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/rina.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サーナイト"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/rudy.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "コイキング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/ruizo.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ザングース"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/ryo.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ポリゴン２"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sadayo.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヌケニン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sandia.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レジアイス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sandy.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ドードリオ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/satoe.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "レアコイル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/shigeko.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ピカチュウ"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/shigenobu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "バネブー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/shinji.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon BELLOSSOM
 	Holds MIRACLE_SEED
-	Moves INGRAIN, POISONPOWDER, RETURN, GIGA_DRAIN
+	Moves INGRAIN, POISON_POWDER, RETURN, GIGA_DRAIN
 	Level 90
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,0,252,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サクラビス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/shizu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ケッキング"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sofia.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon KINGDRA
 	Holds MYSTIC_WATER
-	Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGONBREATH
+	Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGON_BREATH
 	Level 52
 	PP_Ups 0,0,0,0
 	EVs 0,0,0,255,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ライボルト"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sonya.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "マタドガス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sophie.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "キルリア"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/stuart.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "メタグロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/suekichi.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon KECLEON
 	Holds QUICK_CLAW
-	Moves AERIAL_ACE, DOUBLE_TEAM, FAINT_ATTACK, PSYBEAM
+	Moves AERIAL_ACE, DOUBLE_TEAM, FEINT_ATTACK, PSYBEAM
 	Level 55
 	PP_Ups 0,0,0,0
 	EVs 0,255,0,0,255,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サンドパン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/sueno.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ノズパス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/tomoyasu.asm

@@ -55,41 +55,5 @@ INCLUDE "trainers/macros.asm"
 	Text_EN "DUSCLOPS"11
 	Text_JP "サマヨール"11
 	Friendship 255
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 
 	End_Trainer

battle-e/trainers/toshinao.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "クロバット"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/toshitsugu.asm

@@ -45,7 +45,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon CRADILY
 	Holds LEFTOVERS
-	Moves GIGA_DRAIN, ANCIENTPOWER, AMNESIA, RECOVER
+	Moves GIGA_DRAIN, ANCIENT_POWER, AMNESIA, RECOVER
 	Level 58
 	PP_Ups 0,0,0,0
 	EVs 0,0,255,0,0,255
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ユレイドル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/tsutomu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "カイリキー"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/tyler.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "サイドン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/umami.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon ARMALDO
 	Holds LEFTOVERS
-	Moves HYPER_BEAM, ANCIENTPOWER, AERIAL_ACE, SWORDS_DANCE
+	Moves HYPER_BEAM, ANCIENT_POWER, AERIAL_ACE, SWORDS_DANCE
 	Level 100
 	PP_Ups 0,0,0,0
 	EVs 0,252,6,0,0,252
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "メタグロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/wilson.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon GLOOM
 	Holds SUN_STONE
-	Moves POISONPOWDER, STUN_SPORE, SLEEP_POWDER, RAZOR_LEAF
+	Moves POISON_POWDER, STUN_SPORE, SLEEP_POWDER, RAZOR_LEAF
 	Level 50
 	PP_Ups 0,0,0,0
 	EVs 252,0,0,0,252,6
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "パールル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/yoko.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ラブカス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/yu.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ベトベトン"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/yuka.asm

@@ -19,7 +19,7 @@ INCLUDE "trainers/macros.asm"
 
 	Pokemon SABLEYE
 	Holds BRIGHT_POWDER
-	Moves SHADOW_BALL, KNOCK_OFF, FAINT_ATTACK, CONFUSE_RAY
+	Moves SHADOW_BALL, KNOCK_OFF, FEINT_ATTACK, CONFUSE_RAY
 	Level 75
 	PP_Ups 0,0,0,0
 	EVs 252,6,0,0,252,0
@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "パールル"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer

battle-e/trainers/yukio.asm

@@ -56,40 +56,4 @@ INCLUDE "trainers/macros.asm"
 	Text_JP "ヘラクロス"11
 	Friendship 255
 
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
-	Pokemon SPECIES_NONE
-	Holds ITEM_NONE
-	Moves MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	Level 100
-	PP_Ups 0,0,0,0
-	EVs 0,0,0,0,0,0
-	OT_ID 00000, 00000
-	IVs 31,31,31,31,31,31, ABILITY1
-	PV HARDY_FEMALE
-	Text_EN "BULBASUAR"11
-	Friendship 255
-
 	End_Trainer