shithub: pokecrystal

Download patch

ref: d260b5f185276cd789611d946f0be6198a7a368d
parent: 2fb854d80beff1be8d9fc50583d644e146431868
author: Rangi <[email protected]>
date: Tue Jan 30 19:07:11 EST 2018 

Compact trainer data


--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -8,7 +8,6 @@
 		; TRAINERTYPE_MOVES:      level, species, moves
 		; TRAINERTYPE_ITEM:       level, species, item
 		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
-	; Party
 		; Up to six monsters following the data type
 	; $ff
 
@@ -21,19 +20,11 @@
 	db "FALKNER@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 7, PIDGEY
-		db TACKLE
-		db MUD_SLAP
-		db 0
-		db 0
+	db TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
 
 	db 9, PIDGEOTTO
-		db TACKLE
-		db MUD_SLAP
-		db GUST
-		db 0
+	db TACKLE, MUD_SLAP, GUST, NO_MOVE
 
 	db -1 ; end
 
@@ -49,19 +40,11 @@
 	db "WHITNEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, CLEFAIRY
-		db DOUBLESLAP
-		db MIMIC
-		db ENCORE
-		db METRONOME
+	db DOUBLESLAP, MIMIC, ENCORE, METRONOME
 
 	db 20, MILTANK
-		db ROLLOUT
-		db ATTRACT
-		db STOMP
-		db MILK_DRINK
+	db ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 
 	db -1 ; end
 
@@ -77,25 +60,14 @@
 	db "BUGSY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 14, METAPOD
-		db TACKLE
-		db STRING_SHOT
-		db HARDEN
-		db 0
+	db TACKLE, STRING_SHOT, HARDEN, NO_MOVE
 
 	db 14, KAKUNA
-		db POISON_STING
-		db STRING_SHOT
-		db HARDEN
-		db 0
+	db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
 
 	db 16, SCYTHER
-		db QUICK_ATTACK
-		db LEER
-		db FURY_CUTTER
-		db 0
+	db QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 
 	db -1 ; end
 
@@ -111,31 +83,17 @@
 	db "MORTY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, GASTLY
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 21, HAUNTER
-		db HYPNOSIS
-		db MIMIC
-		db CURSE
-		db NIGHT_SHADE
+	db HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
 
 	db 25, GENGAR
-		db HYPNOSIS
-		db SHADOW_BALL
-		db MEAN_LOOK
-		db DREAM_EATER
+	db HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
 
 	db 23, HAUNTER
-		db SPITE
-		db MEAN_LOOK
-		db MIMIC
-		db NIGHT_SHADE
+	db SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 
 	db -1 ; end
 
@@ -151,25 +109,14 @@
 	db "PRYCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, SEEL
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
+	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 
 	db 29, DEWGONG
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
+	db HEADBUTT, ICY_WIND, AURORA_BEAM, REST
 
 	db 31, PILOSWINE
-		db ICY_WIND
-		db FURY_ATTACK
-		db MIST
-		db BLIZZARD
+	db ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 
 	db -1 ; end
 
@@ -185,25 +132,14 @@
 	db "JASMINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
+	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 
 	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
+	db THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
 
 	db 35, STEELIX
-		db SCREECH
-		db SUNNY_DAY
-		db ROCK_THROW
-		db IRON_TAIL
+	db SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 
 	db -1 ; end
 
@@ -219,19 +155,11 @@
 	db "CHUCK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, PRIMEAPE
-		db LEER
-		db RAGE
-		db KARATE_CHOP
-		db FURY_SWIPES
+	db LEER, RAGE, KARATE_CHOP, FURY_SWIPES
 
 	db 30, POLIWRATH
-		db HYPNOSIS
-		db MIND_READER
-		db SURF
-		db DYNAMICPUNCH
+	db HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 
 	db -1 ; end
 
@@ -247,31 +175,17 @@
 	db "CLAIR@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db SURF
-		db SLAM
-		db DRAGONBREATH
+	db THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
 
 	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db THUNDERBOLT
-		db SLAM
-		db DRAGONBREATH
+	db THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
 
 	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db ICE_BEAM
-		db SLAM
-		db DRAGONBREATH
+	db THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
 
 	db 40, KINGDRA
-		db SMOKESCREEN
-		db SURF
-		db HYPER_BEAM
-		db DRAGONBREATH
+	db SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 
 	db -1 ; end
 
@@ -287,7 +201,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, CHIKORITA
 
 	db -1 ; end
@@ -298,7 +211,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, CYNDAQUIL
 
 	db -1 ; end
@@ -309,7 +221,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, TOTODILE
 
 	db -1 ; end
@@ -320,7 +231,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, BAYLEEF
@@ -333,7 +243,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, QUILAVA
@@ -346,7 +255,6 @@
 	db "?@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, CROCONAW
@@ -359,31 +267,17 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, BAYLEEF
-		db GROWL
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
+	db GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
 
 	db -1 ; end
 
@@ -393,31 +287,17 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, QUILAVA
-		db LEER
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
+	db LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 
 	db -1 ; end
 
@@ -427,31 +307,17 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
+	db LICK, SPITE, MEAN_LOOK, CURSE
 
 	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
+	db TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
 
 	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
+	db LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
 
 	db 22, CROCONAW
-		db LEER
-		db RAGE
-		db WATER_GUN
-		db BITE
+	db LEER, RAGE, WATER_GUN, BITE
 
 	db -1 ; end
 
@@ -461,37 +327,20 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
+	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 
 	db -1 ; end
 
@@ -501,37 +350,20 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, QUILAVA
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
+	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 
 	db -1 ; end
 
@@ -541,37 +373,20 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
+	db TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
 
 	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
+	db LICK, MEAN_LOOK, CURSE, SHADOW_BALL
 
 	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
+	db LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
 
 	db 32, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db BITE
-		db SCARY_FACE
+	db RAGE, WATER_GUN, BITE, SCARY_FACE
 
 	db -1 ; end
 
@@ -581,43 +396,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
+	db REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 
 	db -1 ; end
 
@@ -627,43 +422,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, TYPHLOSION
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
+	db SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 
 	db -1 ; end
 
@@ -673,43 +448,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 34, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db 38, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
+	db RAGE, WATER_GUN, SCARY_FACE, SLASH
 
 	db -1 ; end
 
@@ -731,37 +486,20 @@
 	db "WILL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
+	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 
 	db 41, JYNX
-		db DOUBLESLAP
-		db LOVELY_KISS
-		db ICE_PUNCH
-		db PSYCHIC_M
+	db DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
 
 	db 41, EXEGGUTOR
-		db REFLECT
-		db LEECH_SEED
-		db EGG_BOMB
-		db PSYCHIC_M
+	db REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
 
 	db 41, SLOWBRO
-		db CURSE
-		db AMNESIA
-		db BODY_SLAM
-		db PSYCHIC_M
+	db CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
 
 	db 42, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
+	db QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 
 	db -1 ; end
 
@@ -777,7 +515,6 @@
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, CHIKORITA
 	db 10, CYNDAQUIL
 	db 10, TOTODILE
@@ -790,7 +527,6 @@
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BAYLEEF
 	db 30, QUILAVA
 	db 30, CROCONAW
@@ -803,7 +539,6 @@
 	db "CAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 50, MEGANIUM
 	db 50, TYPHLOSION
 	db 50, FERALIGATR
@@ -822,37 +557,20 @@
 	db "BRUNO@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, HITMONTOP
-		db PURSUIT
-		db QUICK_ATTACK
-		db DIG
-		db DETECT
+	db PURSUIT, QUICK_ATTACK, DIG, DETECT
 
 	db 42, HITMONLEE
-		db SWAGGER
-		db DOUBLE_KICK
-		db HI_JUMP_KICK
-		db FORESIGHT
+	db SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
 
 	db 42, HITMONCHAN
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
-		db MACH_PUNCH
+	db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
 
 	db 43, ONIX
-		db BIND
-		db EARTHQUAKE
-		db SANDSTORM
-		db ROCK_SLIDE
+	db BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
 
 	db 46, MACHAMP
-		db ROCK_SLIDE
-		db FORESIGHT
-		db VITAL_THROW
-		db CROSS_CHOP
+	db ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 
 	db -1 ; end
 
@@ -868,37 +586,20 @@
 	db "KAREN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, UMBREON
-		db SAND_ATTACK
-		db CONFUSE_RAY
-		db FAINT_ATTACK
-		db MEAN_LOOK
+	db SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
 
 	db 42, VILEPLUME
-		db STUN_SPORE
-		db ACID
-		db MOONLIGHT
-		db PETAL_DANCE
+	db STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
 
 	db 45, GENGAR
-		db LICK
-		db SPITE
-		db CURSE
-		db DESTINY_BOND
+	db LICK, SPITE, CURSE, DESTINY_BOND
 
 	db 44, MURKROW
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db PURSUIT
-		db FAINT_ATTACK
+	db QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
 
 	db 47, HOUNDOOM
-		db ROAR
-		db PURSUIT
-		db FLAMETHROWER
-		db CRUNCH
+	db ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 
 	db -1 ; end
 
@@ -914,37 +615,20 @@
 	db "KOGA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, ARIADOS
-		db DOUBLE_TEAM
-		db SPIDER_WEB
-		db BATON_PASS
-		db GIGA_DRAIN
+	db DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
 
 	db 41, VENOMOTH
-		db SUPERSONIC
-		db GUST
-		db PSYCHIC_M
-		db TOXIC
+	db SUPERSONIC, GUST, PSYCHIC_M, TOXIC
 
 	db 43, FORRETRESS
-		db PROTECT
-		db SWIFT
-		db EXPLOSION
-		db SPIKES
+	db PROTECT, SWIFT, EXPLOSION, SPIKES
 
 	db 42, MUK
-		db MINIMIZE
-		db ACID_ARMOR
-		db SLUDGE_BOMB
-		db TOXIC
+	db MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
 
 	db 44, CROBAT
-		db DOUBLE_TEAM
-		db QUICK_ATTACK
-		db WING_ATTACK
-		db TOXIC
+	db DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 
 	db -1 ; end
 
@@ -960,43 +644,23 @@
 	db "LANCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 44, GYARADOS
-		db FLAIL
-		db RAIN_DANCE
-		db SURF
-		db HYPER_BEAM
+	db FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
 
 	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db THUNDER
-		db HYPER_BEAM
+	db THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
 
 	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db BLIZZARD
-		db HYPER_BEAM
+	db THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
 
 	db 46, AERODACTYL
-		db WING_ATTACK
-		db ANCIENTPOWER
-		db ROCK_SLIDE
-		db HYPER_BEAM
+	db WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
 
 	db 46, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db HYPER_BEAM
+	db FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
 
 	db 50, DRAGONITE
-		db FIRE_BLAST
-		db SAFEGUARD
-		db OUTRAGE
-		db HYPER_BEAM
+	db FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 
 	db -1 ; end
 
@@ -1012,37 +676,20 @@
 	db "BROCK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, GRAVELER
-		db DEFENSE_CURL
-		db ROCK_SLIDE
-		db ROLLOUT
-		db EARTHQUAKE
+	db DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
 
 	db 41, RHYHORN
-		db FURY_ATTACK
-		db SCARY_FACE
-		db EARTHQUAKE
-		db HORN_DRILL
+	db FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
 
 	db 42, OMASTAR
-		db BITE
-		db SURF
-		db PROTECT
-		db SPIKE_CANNON
+	db BITE, SURF, PROTECT, SPIKE_CANNON
 
 	db 44, ONIX
-		db BIND
-		db ROCK_SLIDE
-		db BIDE
-		db SANDSTORM
+	db BIND, ROCK_SLIDE, BIDE, SANDSTORM
 
 	db 42, KABUTOPS
-		db SLASH
-		db SURF
-		db ENDURE
-		db GIGA_DRAIN
+	db SLASH, SURF, ENDURE, GIGA_DRAIN
 
 	db -1 ; end
 
@@ -1058,31 +705,17 @@
 	db "MISTY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, GOLDUCK
-		db SURF
-		db DISABLE
-		db PSYCH_UP
-		db PSYCHIC_M
+	db SURF, DISABLE, PSYCH_UP, PSYCHIC_M
 
 	db 42, QUAGSIRE
-		db SURF
-		db AMNESIA
-		db EARTHQUAKE
-		db RAIN_DANCE
+	db SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
 
 	db 44, LAPRAS
-		db SURF
-		db PERISH_SONG
-		db BLIZZARD
-		db RAIN_DANCE
+	db SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
 
 	db 47, STARMIE
-		db SURF
-		db CONFUSE_RAY
-		db RECOVER
-		db ICE_BEAM
+	db SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 
 	db -1 ; end
 
@@ -1098,37 +731,20 @@
 	db "LT.SURGE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 44, RAICHU
-		db THUNDER_WAVE
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
+	db THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
 
 	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
+	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 
 	db 40, MAGNETON
-		db LOCK_ON
-		db DOUBLE_TEAM
-		db SWIFT
-		db ZAP_CANNON
+	db LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
 
 	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
+	db SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
 
 	db 46, ELECTABUZZ
-		db QUICK_ATTACK
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db THUNDER
+	db QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 
 	db -1 ; end
 
@@ -1144,7 +760,6 @@
 	db "ROSS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, KOFFING
 	db 22, KOFFING
 
@@ -1156,7 +771,6 @@
 	db "MITCH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, DITTO
 
 	db -1 ; end
@@ -1167,7 +781,6 @@
 	db "JED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
@@ -1180,7 +793,6 @@
 	db "MARC@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
@@ -1193,13 +805,8 @@
 	db "RICH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
+	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 
 	db -1 ; end
 
@@ -1215,31 +822,17 @@
 	db "ERIKA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 42, TANGELA
-		db VINE_WHIP
-		db BIND
-		db GIGA_DRAIN
-		db SLEEP_POWDER
+	db VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
 
 	db 41, JUMPLUFF
-		db MEGA_DRAIN
-		db LEECH_SEED
-		db COTTON_SPORE
-		db GIGA_DRAIN
+	db MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
 
 	db 46, VICTREEBEL
-		db SUNNY_DAY
-		db SYNTHESIS
-		db ACID
-		db RAZOR_LEAF
+	db SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
 
 	db 46, BELLOSSOM
-		db SUNNY_DAY
-		db SYNTHESIS
-		db PETAL_DANCE
-		db SOLARBEAM
+	db SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 
 	db -1 ; end
 
@@ -1255,7 +848,6 @@
 	db "JOEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 4, RATTATA
 
 	db -1 ; end
@@ -1266,7 +858,6 @@
 	db "MIKEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, PIDGEY
 	db 4, RATTATA
 
@@ -1278,7 +869,6 @@
 	db "ALBERT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, RATTATA
 	db 8, ZUBAT
 
@@ -1290,7 +880,6 @@
 	db "GORDON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, WOOPER
 
 	db -1 ; end
@@ -1301,7 +890,6 @@
 	db "SAMUEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, RATTATA
 	db 10, SANDSHREW
 	db 8, SPEAROW
@@ -1315,7 +903,6 @@
 	db "IAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, MANKEY
 	db 12, DIGLETT
 
@@ -1327,7 +914,6 @@
 	db "JOEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, RATTATA
 
 	db -1 ; end
@@ -1338,13 +924,8 @@
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db SCARY_FACE
+	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
 
 	db -1 ; end
 
@@ -1354,7 +935,6 @@
 	db "WARREN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, FEAROW
 
 	db -1 ; end
@@ -1365,7 +945,6 @@
 	db "JIMMY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, RATICATE
 	db 33, ARBOK
 
@@ -1377,7 +956,6 @@
 	db "OWEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, GROWLITHE
 
 	db -1 ; end
@@ -1388,7 +966,6 @@
 	db "JASON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, SANDSLASH
 	db 33, CROBAT
 
@@ -1400,13 +977,8 @@
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
+	db TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
 
 	db -1 ; end
 
@@ -1416,13 +988,8 @@
 	db "JOEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, RATICATE
-		db HYPER_BEAM
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
+	db HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 
 	db -1 ; end
 
@@ -1438,7 +1005,6 @@
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, ODDISH
 	db 15, VOLTORB
 
@@ -1450,7 +1016,6 @@
 	db "KIPP@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, VOLTORB
 	db 27, MAGNEMITE
 	db 31, VOLTORB
@@ -1464,7 +1029,6 @@
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, TANGELA
 
 	db -1 ; end
@@ -1475,7 +1039,6 @@
 	db "JOHNNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, BELLSPROUT
 	db 31, WEEPINBELL
 	db 33, VICTREEBEL
@@ -1488,7 +1051,6 @@
 	db "DANNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, JYNX
 	db 31, ELECTABUZZ
 	db 31, MAGMAR
@@ -1501,7 +1063,6 @@
 	db "TOMMY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, XATU
 	db 34, ALAKAZAM
 
@@ -1513,7 +1074,6 @@
 	db "DUDLEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ODDISH
 
 	db -1 ; end
@@ -1524,7 +1084,6 @@
 	db "JOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, TANGELA
 	db 33, VAPOREON
 
@@ -1536,7 +1095,6 @@
 	db "BILLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, PARAS
 	db 27, PARAS
 	db 27, POLIWHIRL
@@ -1550,7 +1108,6 @@
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, MR__MIME
 
 	db -1 ; end
@@ -1561,7 +1118,6 @@
 	db "NATE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, LEDIAN
 	db 32, EXEGGUTOR
 
@@ -1573,7 +1129,6 @@
 	db "RICKY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, AIPOM
 	db 32, DITTO
 
@@ -1585,7 +1140,6 @@
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, ODDISH
 	db 17, VOLTORB
 
@@ -1597,7 +1151,6 @@
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, GLOOM
 	db 31, ELECTRODE
 
@@ -1609,7 +1162,6 @@
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, TANGELA
 	db 17, YANMA
 
@@ -1621,7 +1173,6 @@
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, NATU
 	db 22, TANGELA
 	db 20, QUAGSIRE
@@ -1635,7 +1186,6 @@
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, MR__MIME
 	db 19, MAGNEMITE
 
@@ -1647,7 +1197,6 @@
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MR__MIME
 	db 31, MAGNETON
 
@@ -1659,7 +1208,6 @@
 	db "JACK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GLOOM
 	db 33, GROWLITHE
 	db 33, ELECTRODE
@@ -1672,25 +1220,14 @@
 	db "JACK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db ROLLOUT
-		db LIGHT_SCREEN
+	db SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
 
 	db 35, GROWLITHE
-		db SUNNY_DAY
-		db LEER
-		db TAKE_DOWN
-		db FLAME_WHEEL
+	db SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
 
 	db 37, VILEPLUME
-		db SOLARBEAM
-		db SLEEP_POWDER
-		db ACID
-		db MOONLIGHT
+	db SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
 
 	db -1 ; end
 
@@ -1700,7 +1237,6 @@
 	db "ALAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, NATU
 	db 27, TANGELA
 	db 30, QUAGSIRE
@@ -1714,31 +1250,17 @@
 	db "ALAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, XATU
-		db PECK
-		db NIGHT_SHADE
-		db SWIFT
-		db FUTURE_SIGHT
+	db PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
 
 	db 32, TANGELA
-		db POISONPOWDER
-		db VINE_WHIP
-		db BIND
-		db MEGA_DRAIN
+	db POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
 
 	db 32, YANMA
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db SONICBOOM
-		db SUPERSONIC
+	db QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
 
 	db 35, QUAGSIRE
-		db TAIL_WHIP
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
+	db TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
 
 	db -1 ; end
 
@@ -1748,7 +1270,6 @@
 	db "CHAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MR__MIME
 	db 34, MAGNETON
 
@@ -1760,19 +1281,11 @@
 	db "CHAD@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, MR__MIME
-		db PSYCHIC_M
-		db LIGHT_SCREEN
-		db REFLECT
-		db ENCORE
+	db PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
 
 	db 38, MAGNETON
-		db ZAP_CANNON
-		db THUNDER_WAVE
-		db LOCK_ON
-		db SWIFT
+	db ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 
 	db -1 ; end
 
@@ -1788,7 +1301,6 @@
 	db "ROD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, PIDGEY
 	db 7, PIDGEY
 
@@ -1800,7 +1312,6 @@
 	db "ABE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, SPEAROW
 
 	db -1 ; end
@@ -1811,7 +1322,6 @@
 	db "BRYAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, PIDGEY
 	db 14, PIDGEOTTO
 
@@ -1823,7 +1333,6 @@
 	db "THEO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, PIDGEY
 	db 15, PIDGEY
 	db 19, PIDGEY
@@ -1838,7 +1347,6 @@
 	db "TOBY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, DODUO
 	db 16, DODUO
 	db 17, DODUO
@@ -1851,7 +1359,6 @@
 	db "DENIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, SPEAROW
 	db 20, FEAROW
 	db 18, SPEAROW
@@ -1864,7 +1371,6 @@
 	db "VANCE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, PIDGEOTTO
 	db 25, PIDGEOTTO
 
@@ -1876,7 +1382,6 @@
 	db "HANK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, PIDGEY
 	db 34, PIDGEOT
 
@@ -1888,7 +1393,6 @@
 	db "ROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, FEAROW
 	db 35, FEAROW
 
@@ -1900,7 +1404,6 @@
 	db "BORIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, DODUO
 	db 28, DODUO
 	db 32, DODRIO
@@ -1913,7 +1416,6 @@
 	db "BOB@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, NOCTOWL
 
 	db -1 ; end
@@ -1924,7 +1426,6 @@
 	db "JOSE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, FARFETCH_D
 
 	db -1 ; end
@@ -1935,7 +1436,6 @@
 	db "PETER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, PIDGEY
 	db 6, PIDGEY
 	db 8, SPEAROW
@@ -1948,7 +1448,6 @@
 	db "JOSE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FARFETCH_D
 
 	db -1 ; end
@@ -1959,7 +1458,6 @@
 	db "PERRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FARFETCH_D
 
 	db -1 ; end
@@ -1970,7 +1468,6 @@
 	db "BRET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PIDGEOTTO
 	db 32, FEAROW
 
@@ -1982,13 +1479,8 @@
 	db "JOSE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, FARFETCH_D
-		db FURY_ATTACK
-		db DETECT
-		db FLY
-		db SLASH
+	db FURY_ATTACK, DETECT, FLY, SLASH
 
 	db -1 ; end
 
@@ -1998,7 +1490,6 @@
 	db "VANCE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PIDGEOTTO
 	db 32, PIDGEOTTO
 
@@ -2010,19 +1501,11 @@
 	db "VANCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 38, PIDGEOT
-		db TOXIC
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db FLY
+	db TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
 
 	db 38, PIDGEOT
-		db SWIFT
-		db DETECT
-		db STEEL_WING
-		db FLY
+	db SWIFT, DETECT, STEEL_WING, FLY
 
 	db -1 ; end
 
@@ -2038,13 +1521,8 @@
 	db "CARRIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, SNUBBULL
-		db SCARY_FACE
-		db CHARM
-		db BITE
-		db LICK
+	db SCARY_FACE, CHARM, BITE, LICK
 
 	db -1 ; end
 
@@ -2054,7 +1532,6 @@
 	db "BRIDGET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
@@ -2067,7 +1544,6 @@
 	db "ALICE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GLOOM
 	db 34, ARBOK
 	db 30, GLOOM
@@ -2080,7 +1556,6 @@
 	db "KRISE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, ODDISH
 	db 15, CUBONE
 
@@ -2092,7 +1567,6 @@
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2103,7 +1577,6 @@
 	db "LINDA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BULBASAUR
 	db 32, IVYSAUR
 	db 34, VENUSAUR
@@ -2116,7 +1589,6 @@
 	db "LAURA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, GLOOM
 	db 31, PIDGEOTTO
 	db 31, BELLOSSOM
@@ -2129,7 +1601,6 @@
 	db "SHANNON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, PARAS
 	db 29, PARAS
 	db 32, PARASECT
@@ -2142,7 +1613,6 @@
 	db "MICHELLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, SKIPLOOM
 	db 33, HOPPIP
 	db 34, JUMPLUFF
@@ -2155,19 +1625,11 @@
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
+	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
 
 	db 18, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db -1 ; end
 
@@ -2177,7 +1639,6 @@
 	db "ELLEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, WIGGLYTUFF
 	db 34, GRANBULL
 
@@ -2189,7 +1650,6 @@
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2200,7 +1660,6 @@
 	db "CONNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, MARILL
 
 	db -1 ; end
@@ -2211,19 +1670,11 @@
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
+	db TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
 
 	db 21, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db -1 ; end
 
@@ -2233,19 +1684,11 @@
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 29, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
+	db SCRATCH, DISABLE, CONFUSION, SCREECH
 
 	db 29, AMPHAROS
-		db TACKLE
-		db THUNDERSHOCK
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
 
 	db -1 ; end
 
@@ -2255,19 +1698,11 @@
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
+	db SCRATCH, DISABLE, CONFUSION, SCREECH
 
 	db 32, AMPHAROS
-		db TACKLE
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 
 	db -1 ; end
 
@@ -2277,19 +1712,11 @@
 	db "DANA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, AMPHAROS
-		db SWIFT
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
+	db SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 
 	db 36, GOLDUCK
-		db DISABLE
-		db SURF
-		db PSYCHIC_M
-		db SCREECH
+	db DISABLE, SURF, PSYCHIC_M, SCREECH
 
 	db -1 ; end
 
@@ -2305,37 +1732,20 @@
 	db "JANINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, CROBAT
-		db SCREECH
-		db SUPERSONIC
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
 
 	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
+	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
 
 	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
+	db SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
 
 	db 33, ARIADOS
-		db SCARY_FACE
-		db GIGA_DRAIN
-		db STRING_SHOT
-		db NIGHT_SHADE
+	db SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
 
 	db 39, VENOMOTH
-		db FORESIGHT
-		db DOUBLE_TEAM
-		db GUST
-		db PSYCHIC_M
+	db FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 
 	db -1 ; end
 
@@ -2351,25 +1761,14 @@
 	db "NICK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 26, CHARMANDER
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
+	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 
 	db 26, SQUIRTLE
-		db WITHDRAW
-		db WATER_GUN
-		db BITE
-		db CURSE
+	db WITHDRAW, WATER_GUN, BITE, CURSE
 
 	db 26, BULBASAUR
-		db LEECH_SEED
-		db POISONPOWDER
-		db SLEEP_POWDER
-		db RAZOR_LEAF
+	db LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 
 	db -1 ; end
 
@@ -2379,7 +1778,6 @@
 	db "AARON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, IVYSAUR
 	db 24, CHARMELEON
 	db 24, WARTORTLE
@@ -2392,7 +1790,6 @@
 	db "PAUL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DRATINI
 	db 34, DRATINI
 	db 34, DRATINI
@@ -2405,7 +1802,6 @@
 	db "CODY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, HORSEA
 	db 36, SEADRA
 
@@ -2417,7 +1813,6 @@
 	db "MIKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, DRAGONAIR
 
 	db -1 ; end
@@ -2428,25 +1823,14 @@
 	db "GAVEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
+	db WRAP, TOXIC, ACID, RAZOR_LEAF
 
 	db 35, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
+	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
 
 	db 35, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2456,25 +1840,14 @@
 	db "GAVEN@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 39, VICTREEBEL, NO_ITEM
-		db GIGA_DRAIN
-		db TOXIC
-		db SLUDGE_BOMB
-		db RAZOR_LEAF
+	db GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
 
 	db 39, KINGLER, KINGS_ROCK
-		db SURF
-		db STOMP
-		db GUILLOTINE
-		db BLIZZARD
+	db SURF, STOMP, GUILLOTINE, BLIZZARD
 
 	db 39, FLAREON, NO_ITEM
-		db FLAMETHROWER
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2484,19 +1857,11 @@
 	db "RYAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, PIDGEOT
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
+	db SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
 
 	db 27, ELECTABUZZ
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db SWIFT
-		db SCREECH
+	db THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
 
 	db -1 ; end
 
@@ -2506,19 +1871,11 @@
 	db "JAKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, PARASECT
-		db LEECH_LIFE
-		db SPORE
-		db SLASH
-		db SWORDS_DANCE
+	db LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
 
 	db 35, GOLDUCK
-		db CONFUSION
-		db SCREECH
-		db PSYCH_UP
-		db FURY_SWIPES
+	db CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
 
 	db -1 ; end
 
@@ -2528,25 +1885,14 @@
 	db "GAVEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
+	db WRAP, TOXIC, ACID, RAZOR_LEAF
 
 	db 32, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
+	db BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
 
 	db 32, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
+	db SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 
 	db -1 ; end
 
@@ -2556,25 +1902,14 @@
 	db "BLAKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, MAGNETON
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SWIFT
-		db SCREECH
+	db THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
 
 	db 31, QUAGSIRE
-		db WATER_GUN
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
+	db WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
 
 	db 31, EXEGGCUTE
-		db LEECH_SEED
-		db CONFUSION
-		db SLEEP_POWDER
-		db SOLARBEAM
+	db LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
 
 	db -1 ; end
 
@@ -2584,13 +1919,8 @@
 	db "BRIAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, SANDSLASH
-		db SAND_ATTACK
-		db POISON_STING
-		db SLASH
-		db SWIFT
+	db SAND_ATTACK, POISON_STING, SLASH, SWIFT
 
 	db -1 ; end
 
@@ -2600,7 +1930,6 @@
 	db "ERICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2613,7 +1942,6 @@
 	db "ANDY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2626,7 +1954,6 @@
 	db "TYLER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
@@ -2639,7 +1966,6 @@
 	db "SEAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, FLAREON
 	db 35, TANGELA
 	db 35, TAUROS
@@ -2652,7 +1978,6 @@
 	db "KEVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 38, RHYHORN
 	db 35, CHARMELEON
 	db 35, WARTORTLE
@@ -2665,7 +1990,6 @@
 	db "STEVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, BULBASAUR
 	db 14, CHARMANDER
 	db 14, SQUIRTLE
@@ -2678,13 +2002,8 @@
 	db "ALLEN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, CHARMELEON
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
+	db EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 
 	db -1 ; end
 
@@ -2694,13 +2013,8 @@
 	db "DARIN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, DRAGONAIR
-		db WRAP
-		db SURF
-		db DRAGON_RAGE
-		db SLAM
+	db WRAP, SURF, DRAGON_RAGE, SLAM
 
 	db -1 ; end
 
@@ -2716,7 +2030,6 @@
 	db "GWEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, EEVEE
 	db 22, FLAREON
 	db 22, VAPOREON
@@ -2730,19 +2043,11 @@
 	db "LOIS@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, SKIPLOOM
-		db SYNTHESIS
-		db POISONPOWDER
-		db MEGA_DRAIN
-		db LEECH_SEED
+	db SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
 
 	db 25, NINETALES
-		db EMBER
-		db QUICK_ATTACK
-		db CONFUSE_RAY
-		db SAFEGUARD
+	db EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
 
 	db -1 ; end
 
@@ -2752,7 +2057,6 @@
 	db "FRAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, SEADRA
 
 	db -1 ; end
@@ -2763,7 +2067,6 @@
 	db "LOLA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DRATINI
 	db 36, DRAGONAIR
 
@@ -2775,7 +2078,6 @@
 	db "KATE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SHELLDER
 	db 28, CLOYSTER
 
@@ -2787,7 +2089,6 @@
 	db "IRENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, GOLDEEN
 	db 24, SEAKING
 
@@ -2799,7 +2100,6 @@
 	db "KELLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MARILL
 	db 24, WARTORTLE
 	db 24, WARTORTLE
@@ -2812,19 +2112,11 @@
 	db "JOYCE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PIKACHU
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db THUNDERBOLT
-		db THUNDER
+	db QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
 
 	db 32, BLASTOISE
-		db BITE
-		db CURSE
-		db SURF
-		db RAIN_DANCE
+	db BITE, CURSE, SURF, RAIN_DANCE
 
 	db -1 ; end
 
@@ -2834,13 +2126,8 @@
 	db "BETH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
+	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 
 	db -1 ; end
 
@@ -2850,7 +2137,6 @@
 	db "REENA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, STARMIE
 	db 33, NIDOQUEEN
 	db 31, STARMIE
@@ -2863,25 +2149,14 @@
 	db "MEGAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, BULBASAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
+	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
 
 	db 32, IVYSAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
+	db GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
 
 	db 32, VENUSAUR
-		db BODY_SLAM
-		db SLEEP_POWDER
-		db RAZOR_LEAF
-		db SWEET_SCENT
+	db BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
 
 	db -1 ; end
 
@@ -2891,13 +2166,8 @@
 	db "BETH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 39, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
+	db STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 
 	db -1 ; end
 
@@ -2907,7 +2177,6 @@
 	db "CAROL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ELECTRODE
 	db 35, STARMIE
 	db 35, NINETALES
@@ -2920,7 +2189,6 @@
 	db "QUINN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 38, IVYSAUR
 	db 38, STARMIE
 
@@ -2932,7 +2200,6 @@
 	db "EMMA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, POLIWHIRL
 
 	db -1 ; end
@@ -2943,19 +2210,11 @@
 	db "CYBIL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db WHIRLWIND
-		db GUST
+	db CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
 
 	db 25, BELLOSSOM
-		db ABSORB
-		db STUN_SPORE
-		db ACID
-		db SOLARBEAM
+	db ABSORB, STUN_SPORE, ACID, SOLARBEAM
 
 	db -1 ; end
 
@@ -2965,7 +2224,6 @@
 	db "JENN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, STARYU
 	db 26, STARMIE
 
@@ -2977,13 +2235,8 @@
 	db "BETH@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 43, RAPIDASH, FOCUS_BAND
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
+	db STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 
 	db -1 ; end
 
@@ -2993,7 +2246,6 @@
 	db "REENA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, STARMIE
 	db 36, NIDOQUEEN
 	db 34, STARMIE
@@ -3006,25 +2258,14 @@
 	db "REENA@"
 	db TRAINERTYPE_ITEM_MOVES
 
-	; party
-
 	db 38, STARMIE, NO_ITEM
-		db DOUBLE_TEAM
-		db PSYCHIC_M
-		db WATERFALL
-		db CONFUSE_RAY
+	db DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
 
 	db 40, NIDOQUEEN, PINK_BOW
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TOXIC
-		db BODY_SLAM
+	db EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
 
 	db 38, STARMIE, NO_ITEM
-		db BLIZZARD
-		db PSYCHIC_M
-		db WATERFALL
-		db RECOVER
+	db BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
 
 	db -1 ; end
 
@@ -3034,25 +2275,14 @@
 	db "CARA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
+	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
 
 	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
+	db SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
 
 	db 35, SEADRA
-		db SWIFT
-		db LEER
-		db WATERFALL
-		db TWISTER
+	db SWIFT, LEER, WATERFALL, TWISTER
 
 	db -1 ; end
 
@@ -3068,7 +2298,6 @@
 	db "VICTORIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, SENTRET
 	db 13, SENTRET
 	db 17, SENTRET
@@ -3081,19 +2310,11 @@
 	db "SAMANTHA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db PAY_DAY
+	db SCRATCH, GROWL, BITE, PAY_DAY
 
 	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db SLASH
+	db SCRATCH, GROWL, BITE, SLASH
 
 	db -1 ; end
 
@@ -3103,7 +2324,6 @@
 	db "JULIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3114,7 +2334,6 @@
 	db "JACLYN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3125,7 +2344,6 @@
 	db "BRENDA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, FURRET
 
 	db -1 ; end
@@ -3136,7 +2354,6 @@
 	db "CASSIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, VILEPLUME
 	db 34, BUTTERFREE
 
@@ -3148,7 +2365,6 @@
 	db "CAROLINE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MARILL
 	db 32, SEEL
 	db 30, MARILL
@@ -3161,7 +2377,6 @@
 	db "CARLENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3172,7 +2387,6 @@
 	db "JESSICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3183,7 +2397,6 @@
 	db "RACHAEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3194,7 +2407,6 @@
 	db "ANGELICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3205,7 +2417,6 @@
 	db "KENDRA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3216,7 +2427,6 @@
 	db "VERONICA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3227,7 +2437,6 @@
 	db "JULIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PARAS
 	db 32, EXEGGCUTE
 	db 35, PARASECT
@@ -3240,7 +2449,6 @@
 	db "THERESA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, SENTRET
 
 	db -1 ; end
@@ -3251,19 +2459,11 @@
 	db "VALERIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, HOPPIP
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db POISONPOWDER
+	db SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
 
 	db 17, SKIPLOOM
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db STUN_SPORE
+	db SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
 
 	db -1 ; end
 
@@ -3273,7 +2473,6 @@
 	db "OLIVIA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, CORSOLA
 
 	db -1 ; end
@@ -3290,7 +2489,6 @@
 	db "LARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SLOWPOKE
 
 	db -1 ; end
@@ -3301,7 +2499,6 @@
 	db "ANDREW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, MAROWAK
 	db 24, MAROWAK
 
@@ -3313,7 +2510,6 @@
 	db "CALVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, KANGASKHAN
 
 	db -1 ; end
@@ -3324,7 +2520,6 @@
 	db "SHANE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, NIDORINA
 	db 16, NIDORINO
 
@@ -3336,7 +2531,6 @@
 	db "BEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, SLOWBRO
 
 	db -1 ; end
@@ -3347,7 +2541,6 @@
 	db "BRENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, LICKITUNG
 
 	db -1 ; end
@@ -3358,7 +2551,6 @@
 	db "RON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, NIDOKING
 
 	db -1 ; end
@@ -3369,7 +2561,6 @@
 	db "ETHAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, RHYHORN
 	db 31, RHYDON
 
@@ -3381,7 +2572,6 @@
 	db "BRENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KANGASKHAN
 
 	db -1 ; end
@@ -3392,13 +2582,8 @@
 	db "BRENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PORYGON
-		db RECOVER
-		db PSYCHIC_M
-		db CONVERSION2
-		db TRI_ATTACK
+	db RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
 
 	db -1 ; end
 
@@ -3408,13 +2593,8 @@
 	db "ISSAC@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 12, LICKITUNG
-		db LICK
-		db SUPERSONIC
-		db CUT
-		db 0
+	db LICK, SUPERSONIC, CUT, NO_MOVE
 
 	db -1 ; end
 
@@ -3424,7 +2604,6 @@
 	db "DONALD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SLOWPOKE
 	db 10, SLOWPOKE
 
@@ -3436,7 +2615,6 @@
 	db "ZACH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, RHYHORN
 
 	db -1 ; end
@@ -3447,13 +2625,8 @@
 	db "BRENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, CHANSEY
-		db ROLLOUT
-		db ATTRACT
-		db EGG_BOMB
-		db SOFTBOILED
+	db ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
 
 	db -1 ; end
 
@@ -3463,7 +2636,6 @@
 	db "MILLER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, NIDOKING
 	db 17, NIDOQUEEN
 
@@ -3481,7 +2653,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, KOFFING
 
 	db -1 ; end
@@ -3492,7 +2663,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, RATTATA
 	db 9, ZUBAT
 	db 9, ZUBAT
@@ -3505,7 +2675,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 24, RATICATE
 
@@ -3517,7 +2686,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GRIMER
 	db 23, GRIMER
 	db 25, MUK
@@ -3530,7 +2698,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, RATTATA
 	db 21, RATTATA
 	db 23, RATTATA
@@ -3545,7 +2712,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, ZUBAT
 	db 26, ZUBAT
 
@@ -3557,7 +2723,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KOFFING
 	db 23, GRIMER
 	db 23, ZUBAT
@@ -3571,7 +2736,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, WEEZING
 
 	db -1 ; end
@@ -3582,7 +2746,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 26, KOFFING
 
@@ -3594,7 +2757,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 	db 24, GOLBAT
 	db 22, GRIMER
@@ -3607,7 +2769,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, MUK
 	db 23, KOFFING
 	db 25, RATTATA
@@ -3620,7 +2781,6 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, HOUNDOUR
 
 	db -1 ; end
@@ -3631,7 +2791,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, RATTATA
 
 	db -1 ; end
@@ -3642,7 +2801,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, RATICATE
 	db 24, GOLBAT
 
@@ -3654,7 +2812,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, GRIMER
 	db 23, WEEZING
 
@@ -3666,7 +2823,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
@@ -3680,7 +2836,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GOLBAT
 
 	db -1 ; end
@@ -3691,7 +2846,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, RATTATA
 	db 17, ZUBAT
 	db 17, RATTATA
@@ -3704,7 +2858,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VENONAT
 	db 18, VENONAT
 
@@ -3716,7 +2869,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, DROWZEE
 	db 19, ZUBAT
 
@@ -3728,7 +2880,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, ZUBAT
 	db 17, GRIMER
 	db 18, RATTATA
@@ -3741,7 +2892,6 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, GOLBAT
 
 	db -1 ; end
@@ -3752,7 +2902,6 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, KOFFING
 
 	db -1 ; end
@@ -3763,7 +2912,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KOFFING
 	db 25, KOFFING
 
@@ -3775,7 +2923,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, KOFFING
 	db 24, MUK
 
@@ -3787,7 +2934,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, RATTATA
 	db 15, RATTATA
 
@@ -3799,7 +2945,6 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 
 	db -1 ; end
@@ -3810,7 +2955,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, RATICATE
 
 	db -1 ; end
@@ -3821,7 +2965,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, RATTATA
 	db 9, RATTATA
 
@@ -3833,7 +2976,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GOLBAT
 	db 25, GOLBAT
 	db 30, ARBOK
@@ -3846,7 +2988,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GOLBAT
 
 	db -1 ; end
@@ -3863,7 +3004,6 @@
 	db "PRESTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GROWLITHE
 	db 18, GROWLITHE
 
@@ -3875,7 +3015,6 @@
 	db "EDWARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, PERSIAN
 
 	db -1 ; end
@@ -3886,7 +3025,6 @@
 	db "GREGORY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, PIKACHU
 	db 33, FLAAFFY
 
@@ -3898,7 +3036,6 @@
 	db "VIRGIL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, PONYTA
 
 	db -1 ; end
@@ -3909,7 +3046,6 @@
 	db "ALFRED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, NOCTOWL
 
 	db -1 ; end
@@ -3926,7 +3062,6 @@
 	db "ROXANNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, JYNX
 
 	db -1 ; end
@@ -3937,7 +3072,6 @@
 	db "CLARISSA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, DEWGONG
 
 	db -1 ; end
@@ -3954,7 +3088,6 @@
 	db "COLETTE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, CLEFAIRY
 
 	db -1 ; end
@@ -3965,7 +3098,6 @@
 	db "HILLARY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, AIPOM
 	db 36, CUBONE
 
@@ -3977,7 +3109,6 @@
 	db "SHIRLEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, JIGGLYPUFF
 
 	db -1 ; end
@@ -3994,25 +3125,14 @@
 	db "SABRINA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 46, ESPEON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db SWIFT
-		db PSYCHIC_M
+	db SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
 
 	db 46, MR__MIME
-		db BARRIER
-		db REFLECT
-		db BATON_PASS
-		db PSYCHIC_M
+	db BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
 
 	db 48, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db -1 ; end
 
@@ -4028,7 +3148,6 @@
 	db "DON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, CATERPIE
 	db 3, CATERPIE
 
@@ -4040,7 +3159,6 @@
 	db "ROB@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, BEEDRILL
 	db 32, BUTTERFREE
 
@@ -4052,7 +3170,6 @@
 	db "ED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, BEEDRILL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
@@ -4065,7 +3182,6 @@
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, CATERPIE
 	db 2, CATERPIE
 	db 3, WEEDLE
@@ -4079,7 +3195,6 @@
 	db "BENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, WEEDLE
 	db 9, KAKUNA
 	db 12, BEEDRILL
@@ -4092,7 +3207,6 @@
 	db "AL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 12, CATERPIE
 	db 12, WEEDLE
 
@@ -4104,7 +3218,6 @@
 	db "JOSH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, PARAS
 
 	db -1 ; end
@@ -4115,7 +3228,6 @@
 	db "ARNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, VENONAT
 
 	db -1 ; end
@@ -4126,7 +3238,6 @@
 	db "KEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, ARIADOS
 	db 32, PINSIR
 
@@ -4138,7 +3249,6 @@
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, METAPOD
 	db 9, METAPOD
 	db 10, KAKUNA
@@ -4152,7 +3262,6 @@
 	db "WADE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, BUTTERFREE
 	db 14, BUTTERFREE
 	db 15, BEEDRILL
@@ -4166,7 +3275,6 @@
 	db "DOUG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, ARIADOS
 
 	db -1 ; end
@@ -4177,7 +3285,6 @@
 	db "ARNIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, VENONAT
 
 	db -1 ; end
@@ -4188,13 +3295,8 @@
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 28, VENOMOTH
-		db DISABLE
-		db SUPERSONIC
-		db CONFUSION
-		db LEECH_LIFE
+	db DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
 
 	db -1 ; end
 
@@ -4204,31 +3306,17 @@
 	db "WADE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 24, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db WHIRLWIND
+	db CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
 
 	db 24, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db WHIRLWIND
+	db CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
 
 	db 25, BEEDRILL
-		db FURY_ATTACK
-		db FOCUS_ENERGY
-		db TWINEEDLE
-		db RAGE
+	db FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
 
 	db 24, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db SUPERSONIC
-		db WHIRLWIND
+	db CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
 
 	db -1 ; end
 
@@ -4238,31 +3326,17 @@
 	db "WADE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db GUST
+	db CONFUSION, POISONPOWDER, SUPERSONIC, GUST
 
 	db 30, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db GUST
+	db CONFUSION, STUN_SPORE, SUPERSONIC, GUST
 
 	db 32, BEEDRILL
-		db FURY_ATTACK
-		db PURSUIT
-		db TWINEEDLE
-		db DOUBLE_TEAM
+	db FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
 
 	db 34, BUTTERFREE
-		db PSYBEAM
-		db SLEEP_POWDER
-		db GUST
-		db WHIRLWIND
+	db PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
 
 	db -1 ; end
 
@@ -4272,13 +3346,8 @@
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYBEAM
-		db LEECH_LIFE
+	db GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
 
 	db -1 ; end
 
@@ -4288,13 +3357,8 @@
 	db "ARNIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 40, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYCHIC_M
-		db TOXIC
+	db GUST, SUPERSONIC, PSYCHIC_M, TOXIC
 
 	db -1 ; end
 
@@ -4304,7 +3368,6 @@
 	db "WAYNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 8, LEDYBA
 	db 10, PARAS
 
@@ -4322,7 +3385,6 @@
 	db "JUSTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 5, MAGIKARP
 	db 5, MAGIKARP
 	db 15, MAGIKARP
@@ -4336,7 +3398,6 @@
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, GOLDEEN
 
 	db -1 ; end
@@ -4347,7 +3408,6 @@
 	db "ARNOLD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, TENTACRUEL
 
 	db -1 ; end
@@ -4358,7 +3418,6 @@
 	db "KYLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, SEAKING
 	db 31, POLIWHIRL
 	db 31, SEAKING
@@ -4371,7 +3430,6 @@
 	db "HENRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 8, POLIWAG
 	db 8, POLIWAG
 
@@ -4383,7 +3441,6 @@
 	db "MARVIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, MAGIKARP
 	db 10, GYARADOS
 	db 15, MAGIKARP
@@ -4397,7 +3454,6 @@
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, QWILFISH
 
 	db -1 ; end
@@ -4408,7 +3464,6 @@
 	db "ANDRE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, GYARADOS
 
 	db -1 ; end
@@ -4419,7 +3474,6 @@
 	db "RAYMOND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
@@ -4433,7 +3487,6 @@
 	db "WILTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GOLDEEN
 	db 23, GOLDEEN
 	db 25, SEAKING
@@ -4446,19 +3499,11 @@
 	db "EDGAR@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
+	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 
 	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
+	db LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 
 	db -1 ; end
 
@@ -4468,7 +3513,6 @@
 	db "JONAH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, SHELLDER
 	db 29, OCTILLERY
 	db 25, REMORAID
@@ -4482,7 +3526,6 @@
 	db "MARTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, REMORAID
 	db 32, REMORAID
 
@@ -4494,7 +3537,6 @@
 	db "STEPHEN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, MAGIKARP
 	db 25, MAGIKARP
 	db 31, QWILFISH
@@ -4508,7 +3550,6 @@
 	db "BARNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GYARADOS
 	db 30, GYARADOS
 	db 30, GYARADOS
@@ -4521,7 +3562,6 @@
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GOLDEEN
 
 	db -1 ; end
@@ -4532,7 +3572,6 @@
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, QWILFISH
 	db 19, GOLDEEN
 
@@ -4544,7 +3583,6 @@
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, QWILFISH
 
 	db -1 ; end
@@ -4555,7 +3593,6 @@
 	db "TULLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, GOLDEEN
 	db 32, GOLDEEN
 	db 32, QWILFISH
@@ -4568,7 +3605,6 @@
 	db "WILTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, GOLDEEN
 	db 29, GOLDEEN
 	db 32, SEAKING
@@ -4581,7 +3617,6 @@
 	db "SCOTT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, QWILFISH
 	db 30, QWILFISH
 	db 34, SEAKING
@@ -4594,25 +3629,14 @@
 	db "WILTON@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
+	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
 
 	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
+	db SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
 
 	db 38, REMORAID
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-		db HYPER_BEAM
+	db PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
 
 	db -1 ; end
 
@@ -4622,7 +3646,6 @@
 	db "RALPH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, QWILFISH
 	db 32, GOLDEEN
 
@@ -4634,19 +3657,11 @@
 	db "RALPH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, QWILFISH
-		db TOXIC
-		db MINIMIZE
-		db SURF
-		db PIN_MISSILE
+	db TOXIC, MINIMIZE, SURF, PIN_MISSILE
 
 	db 39, SEAKING
-		db ENDURE
-		db FLAIL
-		db FURY_ATTACK
-		db WATERFALL
+	db ENDURE, FLAIL, FURY_ATTACK, WATERFALL
 
 	db -1 ; end
 
@@ -4656,25 +3671,14 @@
 	db "TULLY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
+	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
 
 	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
+	db SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
 
 	db 37, QWILFISH
-		db ROLLOUT
-		db SURF
-		db PIN_MISSILE
-		db TAKE_DOWN
+	db ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 
 	db -1 ; end
 
@@ -4690,7 +3694,6 @@
 	db "HAROLD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, REMORAID
 	db 30, SEADRA
 
@@ -4702,7 +3705,6 @@
 	db "SIMON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, TENTACOOL
 	db 20, TENTACOOL
 
@@ -4714,7 +3716,6 @@
 	db "RANDALL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, SHELLDER
 	db 20, WARTORTLE
 	db 18, SHELLDER
@@ -4727,7 +3728,6 @@
 	db "CHARLIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, SHELLDER
 	db 19, TENTACOOL
 	db 19, TENTACRUEL
@@ -4740,7 +3740,6 @@
 	db "GEORGE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, TENTACOOL
 	db 17, TENTACOOL
 	db 16, TENTACOOL
@@ -4756,7 +3755,6 @@
 	db "BERKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, QWILFISH
 
 	db -1 ; end
@@ -4767,7 +3765,6 @@
 	db "KIRK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, GYARADOS
 	db 20, GYARADOS
 
@@ -4779,7 +3776,6 @@
 	db "MATHEW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KRABBY
 
 	db -1 ; end
@@ -4790,7 +3786,6 @@
 	db "HAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
@@ -4803,7 +3798,6 @@
 	db "PATON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, PILOSWINE
 	db 26, PILOSWINE
 
@@ -4815,7 +3809,6 @@
 	db "DARYL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
@@ -4828,7 +3821,6 @@
 	db "WALTER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, HORSEA
 	db 15, HORSEA
 	db 20, SEADRA
@@ -4841,7 +3833,6 @@
 	db "TONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4854,7 +3845,6 @@
 	db "JEROME@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SEADRA
 	db 28, TENTACOOL
 	db 30, TENTACRUEL
@@ -4868,7 +3858,6 @@
 	db "TUCKER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, SHELLDER
 	db 34, CLOYSTER
 
@@ -4880,7 +3869,6 @@
 	db "RICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4893,7 +3881,6 @@
 	db "CAMERON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, MARILL
 
 	db -1 ; end
@@ -4904,7 +3891,6 @@
 	db "SETH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, QUAGSIRE
 	db 29, OCTILLERY
 	db 32, QUAGSIRE
@@ -4917,7 +3903,6 @@
 	db "JAMES@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4930,7 +3915,6 @@
 	db "LEWIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
@@ -4943,7 +3927,6 @@
 	db "PARKER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, HORSEA
 	db 32, HORSEA
 	db 35, SEADRA
@@ -4962,7 +3945,6 @@
 	db "ELAINE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, STARYU
 
 	db -1 ; end
@@ -4973,7 +3955,6 @@
 	db "PAULA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, STARYU
 	db 19, SHELLDER
 
@@ -4985,7 +3966,6 @@
 	db "KAYLEE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GOLDEEN
 	db 20, GOLDEEN
 	db 20, SEAKING
@@ -4998,19 +3978,11 @@
 	db "SUSIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
+	db SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 
 	db 22, GOLDEEN
-		db PECK
-		db TAIL_WHIP
-		db SUPERSONIC
-		db HORN_ATTACK
+	db PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
 
 	db -1 ; end
 
@@ -5020,7 +3992,6 @@
 	db "DENISE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, SEEL
 
 	db -1 ; end
@@ -5031,7 +4002,6 @@
 	db "KARA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, STARYU
 	db 20, STARMIE
 
@@ -5043,19 +4013,11 @@
 	db "WENDY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 21, HORSEA
-		db BUBBLE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
+	db BUBBLE, SMOKESCREEN, LEER, WATER_GUN
 
 	db 21, HORSEA
-		db DRAGON_RAGE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
+	db DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
 
 	db -1 ; end
 
@@ -5065,7 +4027,6 @@
 	db "LISA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, JYNX
 
 	db -1 ; end
@@ -5076,7 +4037,6 @@
 	db "JILL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, DEWGONG
 
 	db -1 ; end
@@ -5087,7 +4047,6 @@
 	db "MARY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5098,7 +4057,6 @@
 	db "KATIE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, DEWGONG
 
 	db -1 ; end
@@ -5109,7 +4067,6 @@
 	db "DAWN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, SEAKING
 
 	db -1 ; end
@@ -5120,7 +4077,6 @@
 	db "TARA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5131,7 +4087,6 @@
 	db "NICOLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MARILL
 	db 29, MARILL
 	db 32, LAPRAS
@@ -5144,7 +4099,6 @@
 	db "LORI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, STARMIE
 	db 32, STARMIE
 
@@ -5156,7 +4110,6 @@
 	db "JODY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SEAKING
 
 	db -1 ; end
@@ -5167,7 +4120,6 @@
 	db "NIKKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, SEEL
 	db 28, SEEL
 	db 28, SEEL
@@ -5181,7 +4133,6 @@
 	db "DIANA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, GOLDUCK
 
 	db -1 ; end
@@ -5192,7 +4143,6 @@
 	db "BRIANA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, SEAKING
 	db 35, SEAKING
 
@@ -5210,7 +4160,6 @@
 	db "EUGENE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, POLIWHIRL
 	db 17, RATICATE
 	db 19, KRABBY
@@ -5223,7 +4172,6 @@
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, POLIWAG
 	db 18, POLIWHIRL
 
@@ -5235,7 +4183,6 @@
 	db "TERRELL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, POLIWHIRL
 
 	db -1 ; end
@@ -5246,19 +4193,11 @@
 	db "KENT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, KRABBY
-		db BUBBLE
-		db LEER
-		db VICEGRIP
-		db HARDEN
+	db BUBBLE, LEER, VICEGRIP, HARDEN
 
 	db 20, KRABBY
-		db BUBBLEBEAM
-		db LEER
-		db VICEGRIP
-		db HARDEN
+	db BUBBLEBEAM, LEER, VICEGRIP, HARDEN
 
 	db -1 ; end
 
@@ -5268,7 +4207,6 @@
 	db "ERNEST@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, MACHOP
 	db 18, MACHOP
 	db 18, POLIWHIRL
@@ -5281,7 +4219,6 @@
 	db "JEFF@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, RATICATE
 	db 32, RATICATE
 
@@ -5293,7 +4230,6 @@
 	db "GARRETT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, KINGLER
 
 	db -1 ; end
@@ -5304,7 +4240,6 @@
 	db "KENNETH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, MACHOP
 	db 28, MACHOP
 	db 28, POLIWRATH
@@ -5318,7 +4253,6 @@
 	db "STANLY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, MACHOP
 	db 33, MACHOKE
 	db 26, PSYDUCK
@@ -5331,7 +4265,6 @@
 	db "HARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, WOOPER
 
 	db -1 ; end
@@ -5342,7 +4275,6 @@
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, POLIWHIRL
 	db 28, POLIWHIRL
 
@@ -5354,7 +4286,6 @@
 	db "HUEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, POLIWHIRL
 	db 34, POLIWRATH
 
@@ -5366,19 +4297,11 @@
 	db "HUEY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 38, POLITOED
-		db WHIRLPOOL
-		db RAIN_DANCE
-		db BODY_SLAM
-		db PERISH_SONG
+	db WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
 
 	db 38, POLIWRATH
-		db SURF
-		db STRENGTH
-		db ICE_PUNCH
-		db SUBMISSION
+	db SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 
 	db -1 ; end
 
@@ -5394,7 +4317,6 @@
 	db "STAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, GRIMER
 
 	db -1 ; end
@@ -5405,7 +4327,6 @@
 	db "ERIC@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, GRIMER
 	db 11, GRIMER
 
@@ -5417,7 +4338,6 @@
 	db "GREGG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
@@ -5430,7 +4350,6 @@
 	db "JAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, KOFFING
 	db 22, KOFFING
 
@@ -5442,7 +4361,6 @@
 	db "DAVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, DITTO
 
 	db -1 ; end
@@ -5453,7 +4371,6 @@
 	db "SAM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, GRIMER
 	db 34, MUK
 
@@ -5465,7 +4382,6 @@
 	db "TOM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
@@ -5478,7 +4394,6 @@
 	db "PAT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, PORYGON
 
 	db -1 ; end
@@ -5489,7 +4404,6 @@
 	db "SHAWN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, MAGNEMITE
 	db 33, MUK
 	db 31, MAGNEMITE
@@ -5502,7 +4416,6 @@
 	db "TERU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, MAGNEMITE
 	db 11, VOLTORB
 	db 7, MAGNEMITE
@@ -5516,7 +4429,6 @@
 	db "RUSS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
@@ -5529,13 +4441,8 @@
 	db "NORTON@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
+	db CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 
 	db -1 ; end
 
@@ -5545,13 +4452,8 @@
 	db "HUGH@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 39, SEADRA
-		db SMOKESCREEN
-		db TWISTER
-		db SURF
-		db WATERFALL
+	db SMOKESCREEN, TWISTER, SURF, WATERFALL
 
 	db -1 ; end
 
@@ -5561,13 +4463,8 @@
 	db "MARKUS@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 19, SLOWPOKE
-		db CURSE
-		db WATER_GUN
-		db GROWL
-		db STRENGTH
+	db CURSE, WATER_GUN, GROWL, STRENGTH
 
 	db -1 ; end
 
@@ -5583,43 +4480,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, MEGANIUM
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
-		db LIGHT_SCREEN
+	db RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
 
 	db -1 ; end
 
@@ -5629,43 +4506,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FLAME_WHEEL
-		db SWIFT
+	db SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
 
 	db -1 ; end
 
@@ -5675,43 +4532,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
+	db DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
 
 	db 45, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
+	db RAGE, WATER_GUN, SCARY_FACE, SLASH
 
 	db -1 ; end
 
@@ -5721,43 +4558,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, MEGANIUM
-		db GIGA_DRAIN
-		db BODY_SLAM
-		db LIGHT_SCREEN
-		db SAFEGUARD
+	db GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
 
 	db -1 ; end
 
@@ -5767,43 +4584,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FIRE_BLAST
-		db SWIFT
+	db SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
 
 	db -1 ; end
 
@@ -5813,43 +4610,23 @@
 	db "?@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
+	db QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
 
 	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
+	db THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
 
 	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
+	db MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
 
 	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
+	db RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 
 	db 50, FERALIGATR
-		db SURF
-		db RAIN_DANCE
-		db SLASH
-		db SCREECH
+	db SURF, RAIN_DANCE, SLASH, SCREECH
 
 	db -1 ; end
 
@@ -5865,7 +4642,6 @@
 	db "CLYDE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, ELECTABUZZ
 
 	db -1 ; end
@@ -5876,7 +4652,6 @@
 	db "VINCENT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, MAGNEMITE
 	db 33, VOLTORB
 	db 32, MAGNEMITE
@@ -5896,7 +4671,6 @@
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, GEODUDE
 	db 18, MACHAMP
 
@@ -5908,7 +4682,6 @@
 	db "RUSSELL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 4, GEODUDE
 	db 6, GEODUDE
 	db 8, GEODUDE
@@ -5921,7 +4694,6 @@
 	db "PHILLIP@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 23, GRAVELER
@@ -5934,7 +4706,6 @@
 	db "LEONARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 25, MACHOP
 
@@ -5946,7 +4717,6 @@
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, GEODUDE
 	db 11, MACHOP
 
@@ -5958,7 +4728,6 @@
 	db "BENJAMIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, DIGLETT
 	db 14, GEODUDE
 	db 16, DUGTRIO
@@ -5971,7 +4740,6 @@
 	db "ERIK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, MACHOP
 	db 27, GRAVELER
 	db 27, MACHOP
@@ -5984,7 +4752,6 @@
 	db "MICHAEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GEODUDE
 	db 25, GRAVELER
 	db 25, GOLEM
@@ -5997,7 +4764,6 @@
 	db "PARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, ONIX
 	db 33, SWINUB
 
@@ -6009,19 +4775,11 @@
 	db "TIMOTHY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, DIGLETT
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
+	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
 
 	db 27, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
+	db MAGNITUDE, DIG, SAND_ATTACK, SLASH
 
 	db -1 ; end
 
@@ -6031,7 +4789,6 @@
 	db "BAILEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
@@ -6046,7 +4803,6 @@
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GRAVELER
 	db 27, GRAVELER
 	db 29, MACHOKE
@@ -6059,7 +4815,6 @@
 	db "TIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, GRAVELER
 	db 31, GRAVELER
 	db 31, GRAVELER
@@ -6072,7 +4827,6 @@
 	db "NOLAND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, SANDSLASH
 	db 33, GOLEM
 
@@ -6084,7 +4838,6 @@
 	db "SIDNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, DUGTRIO
 	db 32, ONIX
 
@@ -6096,7 +4849,6 @@
 	db "KENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, SANDSLASH
 	db 29, GRAVELER
 	db 31, GOLEM
@@ -6110,7 +4862,6 @@
 	db "JIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, MACHAMP
 
 	db -1 ; end
@@ -6121,7 +4872,6 @@
 	db "DANIEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, ONIX
 
 	db -1 ; end
@@ -6132,25 +4882,14 @@
 	db "PARRY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, PILOSWINE
-		db EARTHQUAKE
-		db BLIZZARD
-		db REST
-		db TAKE_DOWN
+	db EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
 
 	db 35, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db MUD_SLAP
-		db SLASH
+	db MAGNITUDE, DIG, MUD_SLAP, SLASH
 
 	db 38, STEELIX
-		db DIG
-		db IRON_TAIL
-		db SANDSTORM
-		db SLAM
+	db DIG, IRON_TAIL, SANDSTORM, SLAM
 
 	db -1 ; end
 
@@ -6160,7 +4899,6 @@
 	db "PARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, ONIX
 
 	db -1 ; end
@@ -6171,7 +4909,6 @@
 	db "ANTHONY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 32, MACHOKE
@@ -6184,25 +4921,14 @@
 	db "ANTHONY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 34, GRAVELER
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
+	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
 
 	db 36, GOLEM
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
+	db MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
 
 	db 34, MACHOKE
-		db KARATE_CHOP
-		db VITAL_THROW
-		db HEADBUTT
-		db DIG
+	db KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 
 	db -1 ; end
 
@@ -6218,7 +4944,6 @@
 	db "BENNY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
@@ -6231,7 +4956,6 @@
 	db "KAZU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
@@ -6244,7 +4968,6 @@
 	db "DWAYNE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, KOFFING
 	db 28, KOFFING
 	db 29, KOFFING
@@ -6258,7 +4981,6 @@
 	db "HARRIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FLAREON
 
 	db -1 ; end
@@ -6269,7 +4991,6 @@
 	db "ZEKE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, KOFFING
 	db 32, KOFFING
 
@@ -6281,7 +5002,6 @@
 	db "CHARLES@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, KOFFING
 	db 30, CHARMELEON
 	db 30, WEEZING
@@ -6294,7 +5014,6 @@
 	db "RILEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, WEEZING
 
 	db -1 ; end
@@ -6305,7 +5024,6 @@
 	db "JOEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MAGMAR
 	db 32, MAGMAR
 
@@ -6317,7 +5035,6 @@
 	db "GLENN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, KOFFING
 	db 30, MAGMAR
 	db 32, WEEZING
@@ -6336,25 +5053,14 @@
 	db "BLAINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 45, MAGCARGO
-		db CURSE
-		db SMOG
-		db FLAMETHROWER
-		db ROCK_SLIDE
+	db CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
 
 	db 45, MAGMAR
-		db THUNDERPUNCH
-		db FIRE_PUNCH
-		db SUNNY_DAY
-		db CONFUSE_RAY
+	db THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
 
 	db 50, RAPIDASH
-		db QUICK_ATTACK
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
+	db QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 
 	db -1 ; end
 
@@ -6370,7 +5076,6 @@
 	db "DUNCAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, KOFFING
 	db 25, MAGMAR
 	db 23, KOFFING
@@ -6383,19 +5088,11 @@
 	db "EDDIE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 26, GROWLITHE
-		db ROAR
-		db EMBER
-		db LEER
-		db TAKE_DOWN
+	db ROAR, EMBER, LEER, TAKE_DOWN
 
 	db 24, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
 
 	db -1 ; end
 
@@ -6405,7 +5102,6 @@
 	db "COREY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, KOFFING
 	db 28, MAGMAR
 	db 25, KOFFING
@@ -6425,7 +5121,6 @@
 	db "OTIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MAGMAR
 	db 32, WEEZING
 	db 29, MAGMAR
@@ -6438,7 +5133,6 @@
 	db "DICK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, CHARMELEON
 
 	db -1 ; end
@@ -6449,7 +5143,6 @@
 	db "NED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, KOFFING
 	db 16, GROWLITHE
 	db 15, KOFFING
@@ -6462,7 +5155,6 @@
 	db "BURT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, KOFFING
 	db 32, SLUGMA
 
@@ -6474,7 +5166,6 @@
 	db "BILL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, KOFFING
 	db 6, KOFFING
 
@@ -6486,7 +5177,6 @@
 	db "WALT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 11, MAGMAR
 	db 13, MAGMAR
 
@@ -6498,7 +5188,6 @@
 	db "RAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, VULPIX
 
 	db -1 ; end
@@ -6509,7 +5198,6 @@
 	db "LYLE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, KOFFING
 	db 31, FLAREON
 	db 28, KOFFING
@@ -6528,7 +5216,6 @@
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 2, VOLTORB
 	db 6, VOLTORB
 	db 10, VOLTORB
@@ -6542,7 +5229,6 @@
 	db "FRITZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, MR__MIME
 	db 29, MAGMAR
 	db 29, MACHOKE
@@ -6555,7 +5241,6 @@
 	db "HORTON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
@@ -6569,7 +5254,6 @@
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
@@ -6583,7 +5267,6 @@
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
@@ -6597,7 +5280,6 @@
 	db "IRWIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
@@ -6617,7 +5299,6 @@
 	db "KENJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 27, ONIX
 	db 30, HITMONLEE
 	db 27, ONIX
@@ -6631,13 +5312,8 @@
 	db "YOSHI@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, HITMONLEE
-		db DOUBLE_KICK
-		db MEDITATE
-		db JUMP_KICK
-		db FOCUS_ENERGY
+	db DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
 
 	db -1 ; end
 
@@ -6647,31 +5323,17 @@
 	db "KENJI@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, ONIX
-		db BIND
-		db ROCK_THROW
-		db TOXIC
-		db DIG
+	db BIND, ROCK_THROW, TOXIC, DIG
 
 	db 38, MACHAMP
-		db HEADBUTT
-		db SWAGGER
-		db THUNDERPUNCH
-		db VITAL_THROW
+	db HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
 
 	db 33, STEELIX
-		db EARTHQUAKE
-		db ROCK_THROW
-		db IRON_TAIL
-		db SANDSTORM
+	db EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
 
 	db 36, HITMONLEE
-		db DOUBLE_TEAM
-		db HI_JUMP_KICK
-		db MUD_SLAP
-		db SWIFT
+	db DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
 
 	db -1 ; end
 
@@ -6681,13 +5343,8 @@
 	db "LAO@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 27, HITMONCHAN
-		db COMET_PUNCH
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
+	db COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
 
 	db -1 ; end
 
@@ -6697,19 +5354,11 @@
 	db "NOB@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 25, MACHOP
-		db LEER
-		db FOCUS_ENERGY
-		db KARATE_CHOP
-		db SEISMIC_TOSS
+	db LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
 
 	db 25, MACHOKE
-		db LEER
-		db KARATE_CHOP
-		db SEISMIC_TOSS
-		db ROCK_SLIDE
+	db LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
 
 	db -1 ; end
 
@@ -6719,7 +5368,6 @@
 	db "KIYO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, HITMONLEE
 	db 34, HITMONCHAN
 
@@ -6731,7 +5379,6 @@
 	db "LUNG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, MANKEY
 	db 23, MANKEY
 	db 25, PRIMEAPE
@@ -6744,7 +5391,6 @@
 	db "KENJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 28, MACHOKE
 
 	db -1 ; end
@@ -6755,7 +5401,6 @@
 	db "WAI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, MACHOKE
 	db 32, MACHOKE
 	db 34, MACHOKE
@@ -6774,25 +5419,14 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, HOUNDOUR
-		db EMBER
-		db ROAR
-		db BITE
-		db FAINT_ATTACK
+	db EMBER, ROAR, BITE, FAINT_ATTACK
 
 	db 33, KOFFING
-		db TACKLE
-		db SLUDGE
-		db SMOKESCREEN
-		db HAZE
+	db TACKLE, SLUDGE, SMOKESCREEN, HAZE
 
 	db 35, HOUNDOOM
-		db EMBER
-		db SMOG
-		db BITE
-		db FAINT_ATTACK
+	db EMBER, SMOG, BITE, FAINT_ATTACK
 
 	db -1 ; end
 
@@ -6802,13 +5436,8 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
+	db LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 
 	db -1 ; end
 
@@ -6818,43 +5447,23 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 32, WEEZING
-		db TACKLE
-		db EXPLOSION
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 
 	db 30, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
+	db TACKLE, SMOG, SLUDGE, SMOKESCREEN
 
 	db -1 ; end
 
@@ -6864,7 +5473,6 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, ZUBAT
 	db 24, RATICATE
 	db 22, KOFFING
@@ -6883,7 +5491,6 @@
 	db "NATHAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, GIRAFARIG
 
 	db -1 ; end
@@ -6894,7 +5501,6 @@
 	db "FRANKLIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, KADABRA
 
 	db -1 ; end
@@ -6905,7 +5511,6 @@
 	db "HERMAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, EXEGGCUTE
 	db 30, EXEGGCUTE
 	db 30, EXEGGUTOR
@@ -6918,7 +5523,6 @@
 	db "FIDEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, XATU
 
 	db -1 ; end
@@ -6929,13 +5533,8 @@
 	db "GREG@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, DROWZEE
-		db HYPNOSIS
-		db DISABLE
-		db DREAM_EATER
-		db 0
+	db HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
 
 	db -1 ; end
 
@@ -6945,19 +5544,11 @@
 	db "NORMAN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 17, SLOWPOKE
-		db TACKLE
-		db GROWL
-		db WATER_GUN
-		db 0
+	db TACKLE, GROWL, WATER_GUN, NO_MOVE
 
 	db 20, SLOWPOKE
-		db CURSE
-		db BODY_SLAM
-		db WATER_GUN
-		db CONFUSION
+	db CURSE, BODY_SLAM, WATER_GUN, CONFUSION
 
 	db -1 ; end
 
@@ -6967,25 +5558,14 @@
 	db "MARK@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
+	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
 
 	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
+	db TELEPORT, FLASH, NO_MOVE, NO_MOVE
 
 	db 15, KADABRA
-		db TELEPORT
-		db KINESIS
-		db CONFUSION
-		db 0
+	db TELEPORT, KINESIS, CONFUSION, NO_MOVE
 
 	db -1 ; end
 
@@ -6995,19 +5575,11 @@
 	db "PHIL@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 24, NATU
-		db LEER
-		db NIGHT_SHADE
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
+	db LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
 
 	db 26, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
+	db DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 
 	db -1 ; end
 
@@ -7017,7 +5589,6 @@
 	db "RICHARD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, ESPEON
 
 	db -1 ; end
@@ -7028,7 +5599,6 @@
 	db "GILBERT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, STARMIE
 	db 30, EXEGGCUTE
 	db 34, GIRAFARIG
@@ -7041,7 +5611,6 @@
 	db "JARED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, MR__MIME
 	db 32, EXEGGCUTE
 	db 35, EXEGGCUTE
@@ -7054,7 +5623,6 @@
 	db "RODNEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 29, DROWZEE
 	db 33, HYPNO
 
@@ -7072,7 +5640,6 @@
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, NIDORAN_F
 
 	db -1 ; end
@@ -7083,7 +5650,6 @@
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, HOPPIP
 	db 9, HOPPIP
 	db 12, BULBASAUR
@@ -7096,13 +5662,8 @@
 	db "BROOKE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, PIKACHU
-		db THUNDERSHOCK
-		db GROWL
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
+	db THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
 
 	db -1 ; end
 
@@ -7112,7 +5673,6 @@
 	db "KIM@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, VULPIX
 
 	db -1 ; end
@@ -7123,7 +5683,6 @@
 	db "CINDY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, NIDOQUEEN
 
 	db -1 ; end
@@ -7134,7 +5693,6 @@
 	db "HOPE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, FLAAFFY
 
 	db -1 ; end
@@ -7145,7 +5703,6 @@
 	db "SHARON@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, FURRET
 	db 33, RAPIDASH
 
@@ -7157,7 +5714,6 @@
 	db "DEBRA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, SEAKING
 
 	db -1 ; end
@@ -7168,7 +5724,6 @@
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, HOPPIP
 	db 14, HOPPIP
 	db 17, IVYSAUR
@@ -7181,7 +5736,6 @@
 	db "ERIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, PONYTA
 	db 16, PONYTA
 
@@ -7193,7 +5747,6 @@
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, WEEPINBELL
 	db 15, NIDORINA
 
@@ -7205,7 +5758,6 @@
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 19, WEEPINBELL
 	db 19, NIDORINO
 	db 21, NIDOQUEEN
@@ -7218,7 +5770,6 @@
 	db "HEIDI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, SKIPLOOM
 	db 32, SKIPLOOM
 
@@ -7230,7 +5781,6 @@
 	db "EDNA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, NIDORINA
 	db 34, RAICHU
 
@@ -7242,7 +5792,6 @@
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SKIPLOOM
 	db 26, SKIPLOOM
 	db 29, IVYSAUR
@@ -7255,13 +5804,8 @@
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 31, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
+	db ENCORE, SING, DOUBLESLAP, MINIMIZE
 
 	db -1 ; end
 
@@ -7271,13 +5815,8 @@
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 37, CLEFAIRY
-		db ENCORE
-		db DOUBLESLAP
-		db MINIMIZE
-		db METRONOME
+	db ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
 
 	db -1 ; end
 
@@ -7287,7 +5826,6 @@
 	db "ERIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, PONYTA
 	db 32, PONYTA
 
@@ -7299,7 +5837,6 @@
 	db "TANYA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, EXEGGUTOR
 
 	db -1 ; end
@@ -7310,13 +5847,8 @@
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 20, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
+	db ENCORE, SING, DOUBLESLAP, MINIMIZE
 
 	db -1 ; end
 
@@ -7326,25 +5858,14 @@
 	db "ERIN@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
+	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 
 	db 34, RAICHU
-		db SWIFT
-		db MUD_SLAP
-		db QUICK_ATTACK
-		db THUNDERBOLT
+	db SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
 
 	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
+	db DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 
 	db -1 ; end
 
@@ -7354,7 +5875,6 @@
 	db "LIZ@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, WEEPINBELL
 	db 26, NIDORINO
 	db 26, NIDOQUEEN
@@ -7367,25 +5887,14 @@
 	db "LIZ@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 30, WEEPINBELL
-		db SLEEP_POWDER
-		db POISONPOWDER
-		db STUN_SPORE
-		db SLUDGE_BOMB
+	db SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
 
 	db 32, NIDOKING
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db POISON_STING
-		db IRON_TAIL
+	db EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
 
 	db 32, NIDOQUEEN
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TAIL_WHIP
-		db BODY_SLAM
+	db EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
 
 	db -1 ; end
 
@@ -7395,7 +5904,6 @@
 	db "GINA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, SKIPLOOM
 	db 30, SKIPLOOM
 	db 32, IVYSAUR
@@ -7408,25 +5916,14 @@
 	db "GINA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, JUMPLUFF
-		db STUN_SPORE
-		db SUNNY_DAY
-		db LEECH_SEED
-		db COTTON_SPORE
+	db STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
 
 	db 33, JUMPLUFF
-		db SUNNY_DAY
-		db SLEEP_POWDER
-		db LEECH_SEED
-		db COTTON_SPORE
+	db SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
 
 	db 38, VENUSAUR
-		db SOLARBEAM
-		db RAZOR_LEAF
-		db HEADBUTT
-		db MUD_SLAP
+	db SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
 
 	db -1 ; end
 
@@ -7436,13 +5933,8 @@
 	db "TIFFANY@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 43, CLEFAIRY
-		db METRONOME
-		db ENCORE
-		db MOONLIGHT
-		db MINIMIZE
+	db METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 
 	db -1 ; end
 
@@ -7458,7 +5950,6 @@
 	db "ROLAND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, NIDORAN_M
 
 	db -1 ; end
@@ -7469,7 +5960,6 @@
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, PSYDUCK
 
 	db -1 ; end
@@ -7480,7 +5970,6 @@
 	db "IVAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, DIGLETT
 	db 10, ZUBAT
 	db 14, DIGLETT
@@ -7493,7 +5982,6 @@
 	db "ELLIOT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 13, SANDSHREW
 	db 15, MARILL
 
@@ -7505,7 +5993,6 @@
 	db "BARRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 36, NIDOKING
 
 	db -1 ; end
@@ -7516,7 +6003,6 @@
 	db "LLOYD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, NIDOKING
 
 	db -1 ; end
@@ -7527,7 +6013,6 @@
 	db "DEAN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GOLDUCK
 	db 31, SANDSLASH
 
@@ -7539,7 +6024,6 @@
 	db "SID@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, DUGTRIO
 	db 29, PRIMEAPE
 	db 29, POLIWRATH
@@ -7552,7 +6036,6 @@
 	db "HARVEY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, NIDORINO
 
 	db -1 ; end
@@ -7563,7 +6046,6 @@
 	db "DALE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 15, NIDORINO
 
 	db -1 ; end
@@ -7574,7 +6056,6 @@
 	db "TED@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, MANKEY
 
 	db -1 ; end
@@ -7585,7 +6066,6 @@
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GEODUDE
 	db 17, GEODUDE
 	db 23, PSYDUCK
@@ -7598,7 +6078,6 @@
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 26, PSYDUCK
@@ -7611,7 +6090,6 @@
 	db "THOMAS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7625,7 +6103,6 @@
 	db "LEROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7639,7 +6116,6 @@
 	db "DAVID@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7653,7 +6129,6 @@
 	db "JOHN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
@@ -7667,7 +6142,6 @@
 	db "JERRY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 37, SANDSLASH
 
 	db -1 ; end
@@ -7678,7 +6152,6 @@
 	db "SPENCER@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, SANDSHREW
 	db 17, SANDSLASH
 	db 19, ZUBAT
@@ -7691,7 +6164,6 @@
 	db "TODD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 30, SLUGMA
@@ -7705,31 +6177,17 @@
 	db "TODD@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
+	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
 
 	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
+	db SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
 
 	db 36, MAGCARGO
-		db ROCK_THROW
-		db HARDEN
-		db AMNESIA
-		db FLAMETHROWER
+	db ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
 
 	db 34, GOLDUCK
-		db DISABLE
-		db PSYCHIC_M
-		db SURF
-		db PSYCH_UP
+	db DISABLE, PSYCHIC_M, SURF, PSYCH_UP
 
 	db -1 ; end
 
@@ -7739,7 +6197,6 @@
 	db "QUENTIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 30, FEAROW
 	db 30, PRIMEAPE
 	db 30, TAUROS
@@ -7758,25 +6215,14 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 32, ARBOK
-		db WRAP
-		db POISON_STING
-		db BITE
-		db GLARE
+	db WRAP, POISON_STING, BITE, GLARE
 
 	db 32, VILEPLUME
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
+	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 
 	db 32, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db NIGHT_SHADE
+	db PECK, PURSUIT, HAZE, NIGHT_SHADE
 
 	db -1 ; end
 
@@ -7786,25 +6232,14 @@
 	db "EXECUTIVE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 23, ARBOK
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
+	db WRAP, LEER, POISON_STING, BITE
 
 	db 23, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
+	db ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 
 	db 25, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db 0
+	db PECK, PURSUIT, HAZE, NO_MOVE
 
 	db -1 ; end
 
@@ -7820,7 +6255,6 @@
 	db "CHOW@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7833,7 +6267,6 @@
 	db "NICO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7846,7 +6279,6 @@
 	db "JIN@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, BELLSPROUT
 
 	db -1 ; end
@@ -7857,7 +6289,6 @@
 	db "TROY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, BELLSPROUT
 	db 7, HOOTHOOT
 
@@ -7869,7 +6300,6 @@
 	db "JEFFREY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 22, HAUNTER
 
 	db -1 ; end
@@ -7880,7 +6310,6 @@
 	db "PING@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
@@ -7895,7 +6324,6 @@
 	db "EDMOND@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
 	db 3, BELLSPROUT
@@ -7908,7 +6336,6 @@
 	db "NEAL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 6, BELLSPROUT
 
 	db -1 ; end
@@ -7919,7 +6346,6 @@
 	db "LI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 7, BELLSPROUT
 	db 7, BELLSPROUT
 	db 10, HOOTHOOT
@@ -7932,7 +6358,6 @@
 	db "GAKU@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, FLAREON
 
@@ -7944,7 +6369,6 @@
 	db "MASA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, JOLTEON
 
@@ -7956,7 +6380,6 @@
 	db "KOJI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 32, NOCTOWL
 	db 32, VAPOREON
 
@@ -7974,7 +6397,6 @@
 	db "MARTHA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 18, GASTLY
 	db 20, HAUNTER
 	db 20, GASTLY
@@ -7987,7 +6409,6 @@
 	db "GRACE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, HAUNTER
 	db 20, HAUNTER
 
@@ -7999,7 +6420,6 @@
 	db "BETHANY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8010,7 +6430,6 @@
 	db "MARGRET@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8021,7 +6440,6 @@
 	db "ETHEL@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, HAUNTER
 
 	db -1 ; end
@@ -8032,7 +6450,6 @@
 	db "REBECCA@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, DROWZEE
 	db 35, HYPNO
 
@@ -8044,7 +6461,6 @@
 	db "DORIS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 34, SLOWPOKE
 	db 36, SLOWBRO
 
@@ -8062,7 +6478,6 @@
 	db "RONALD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
@@ -8075,7 +6490,6 @@
 	db "BRAD@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, SWINUB
 	db 26, SWINUB
 
@@ -8087,7 +6501,6 @@
 	db "DOUGLAS@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
@@ -8106,7 +6519,6 @@
 	db "WILLIAM@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 14, RAICHU, BERRY
 
 	db -1 ; end
@@ -8117,7 +6529,6 @@
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 17, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8128,7 +6539,6 @@
 	db "ROBERT@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 33, QUAGSIRE, BERRY
 
 	db -1 ; end
@@ -8139,7 +6549,6 @@
 	db "JOSHUA@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
 	db 23, PIKACHU, BERRY
@@ -8155,7 +6564,6 @@
 	db "CARTER@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 29, BULBASAUR, BERRY
 	db 29, CHARMANDER, BERRY
 	db 29, SQUIRTLE, BERRY
@@ -8168,7 +6576,6 @@
 	db "TREVOR@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 33, PSYDUCK, BERRY
 
 	db -1 ; end
@@ -8179,7 +6586,6 @@
 	db "BRANDON@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 13, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8190,7 +6596,6 @@
 	db "JEREMY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
 	db 28, MEOWTH, BERRY
@@ -8203,7 +6608,6 @@
 	db "COLIN@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 32, DELIBIRD, BERRY
 
 	db -1 ; end
@@ -8214,7 +6618,6 @@
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 19, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8225,7 +6628,6 @@
 	db "DEREK@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 36, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8236,7 +6638,6 @@
 	db "ALEX@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 29, NIDOKING, BERRY
 	db 29, SLOWKING, BERRY
 	db 29, SEAKING, BERRY
@@ -8249,7 +6650,6 @@
 	db "REX@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 35, PHANPY, BERRY
 
 	db -1 ; end
@@ -8260,7 +6660,6 @@
 	db "ALLAN@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 35, TEDDIURSA, BERRY
 
 	db -1 ; end
@@ -8277,7 +6676,6 @@
 	db "NAOKO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 20, SKIPLOOM
 	db 20, VULPIX
 	db 18, SKIPLOOM
@@ -8290,7 +6688,6 @@
 	db "NAOKO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, FLAREON
 
 	db -1 ; end
@@ -8301,7 +6698,6 @@
 	db "SAYO@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, ESPEON
 
 	db -1 ; end
@@ -8312,7 +6708,6 @@
 	db "ZUKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, UMBREON
 
 	db -1 ; end
@@ -8323,7 +6718,6 @@
 	db "KUNI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, VAPOREON
 
 	db -1 ; end
@@ -8334,7 +6728,6 @@
 	db "MIKI@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, JOLTEON
 
 	db -1 ; end
@@ -8351,7 +6744,6 @@
 	db "AMY & MAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, SPINARAK
 	db 10, LEDYBA
 
@@ -8363,19 +6755,11 @@
 	db "ANN & ANNE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
+	db GROWL, ENCORE, DOUBLESLAP, METRONOME
 
 	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
+	db SING, DEFENSE_CURL, POUND, DISABLE
 
 	db -1 ; end
 
@@ -8385,19 +6769,11 @@
 	db "ANN & ANNE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
+	db SING, DEFENSE_CURL, POUND, DISABLE
 
 	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
+	db GROWL, ENCORE, DOUBLESLAP, METRONOME
 
 	db -1 ; end
 
@@ -8407,7 +6783,6 @@
 	db "AMY & MAY@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 10, LEDYBA
 	db 10, SPINARAK
 
@@ -8419,7 +6794,6 @@
 	db "JO & ZOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, VICTREEBEL
 	db 35, VILEPLUME
 
@@ -8431,7 +6805,6 @@
 	db "JO & ZOE@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 35, VILEPLUME
 	db 35, VICTREEBEL
 
@@ -8443,7 +6816,6 @@
 	db "MEG & PEG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, TEDDIURSA
 	db 31, PHANPY
 
@@ -8455,7 +6827,6 @@
 	db "MEG & PEG@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 31, PHANPY
 	db 31, TEDDIURSA
 
@@ -8467,19 +6838,11 @@
 	db "LEA & PIA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 
 	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 
 	db -1 ; end
 
@@ -8489,19 +6852,11 @@
 	db "LEA & PIA@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 
 	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
+	db THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 
 	db -1 ; end
 
@@ -8517,7 +6872,6 @@
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 14, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8528,7 +6882,6 @@
 	db "RUTH@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 17, PIKACHU, BERRY
 
 	db -1 ; end
@@ -8539,7 +6892,6 @@
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 18, SNUBBULL, BERRY
 
 	db -1 ; end
@@ -8550,7 +6902,6 @@
 	db "BEVERLY@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 30, GRANBULL, BERRY
 
 	db -1 ; end
@@ -8561,7 +6912,6 @@
 	db "GEORGIA@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
 	db 23, SENTRET, BERRY
@@ -8576,7 +6926,6 @@
 	db "JAIME@"
 	db TRAINERTYPE_ITEM
 
-	; party
 	db 16, MEOWTH, BERRY
 
 	db -1 ; end
@@ -8593,43 +6942,23 @@
 	db "RED@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 81, PIKACHU
-		db CHARM
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
+	db CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
 
 	db 73, ESPEON
-		db MUD_SLAP
-		db REFLECT
-		db SWIFT
-		db PSYCHIC_M
+	db MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
 
 	db 75, SNORLAX
-		db AMNESIA
-		db SNORE
-		db REST
-		db BODY_SLAM
+	db AMNESIA, SNORE, REST, BODY_SLAM
 
 	db 77, VENUSAUR
-		db SUNNY_DAY
-		db GIGA_DRAIN
-		db SYNTHESIS
-		db SOLARBEAM
+	db SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
 
 	db 77, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db FIRE_SPIN
+	db FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
 
 	db 77, BLASTOISE
-		db RAIN_DANCE
-		db SURF
-		db BLIZZARD
-		db WHIRLPOOL
+	db RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 
 	db -1 ; end
 
@@ -8645,43 +6974,23 @@
 	db "BLUE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 56, PIDGEOT
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
-		db MIRROR_MOVE
+	db QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
 
 	db 54, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db PSYCHIC_M
-		db REFLECT
+	db DISABLE, RECOVER, PSYCHIC_M, REFLECT
 
 	db 56, RHYDON
-		db FURY_ATTACK
-		db SANDSTORM
-		db ROCK_SLIDE
-		db EARTHQUAKE
+	db FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
 
 	db 58, GYARADOS
-		db TWISTER
-		db HYDRO_PUMP
-		db RAIN_DANCE
-		db HYPER_BEAM
+	db TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
 
 	db 58, EXEGGUTOR
-		db SUNNY_DAY
-		db LEECH_SEED
-		db EGG_BOMB
-		db SOLARBEAM
+	db SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
 
 	db 58, ARCANINE
-		db ROAR
-		db SWIFT
-		db FLAMETHROWER
-		db EXTREMESPEED
+	db ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 
 	db -1 ; end
 
@@ -8697,7 +7006,6 @@
 	db "KEITH@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 17, GROWLITHE
 
 	db -1 ; end
@@ -8708,7 +7016,6 @@
 	db "DIRK@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 14, GROWLITHE
 	db 14, GROWLITHE
 
@@ -8726,7 +7033,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 9, ZUBAT
 	db 11, EKANS
 
@@ -8738,7 +7044,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 26, ARBOK
 
 	db -1 ; end
@@ -8749,7 +7054,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 25, GLOOM
 	db 25, GLOOM
 
@@ -8761,7 +7065,6 @@
 	db "GRUNT@"
 	db TRAINERTYPE_NORMAL
 
-	; party
 	db 21, EKANS
 	db 23, ODDISH
 	db 21, EKANS
@@ -8775,19 +7078,11 @@
 	db "GRUNT@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 18, EKANS
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
+	db WRAP, LEER, POISON_STING, BITE
 
 	db 18, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db STUN_SPORE
-		db SLEEP_POWDER
+	db ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 
 	db -1 ; end
 
@@ -8803,25 +7098,14 @@
 	db "EUSINE@"
 	db TRAINERTYPE_MOVES
 
-	; party
-
 	db 23, DROWZEE
-		db DREAM_EATER
-		db HYPNOSIS
-		db DISABLE
-		db CONFUSION
+	db DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
 
 	db 23, HAUNTER
-		db LICK
-		db HYPNOSIS
-		db MEAN_LOOK
-		db CURSE
+	db LICK, HYPNOSIS, MEAN_LOOK, CURSE
 
 	db 25, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db THUNDER
-		db ROLLOUT
+	db SCREECH, SONICBOOM, THUNDER, ROLLOUT
 
 	db -1 ; end