battle frontier/tent pokemon

asm/emerald.s

@@ -690496,7 +690496,7 @@ sub_8165C40: ; 8165C40
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r0, [r2]
 	lsls r0, 30
@@ -690659,7 +690659,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690670,7 +690670,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gVerdanturfBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DEC28
+	ldr r0, =gVerdanturfBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690681,7 +690681,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gFallarborBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DF69C
+	ldr r0, =gFallarborBattleTentMons
 	b @08165DF2
 	.align 2, 0
 	.pool
@@ -690690,7 +690690,7 @@ sub_8165D78: ; 8165D78
 	ldr r0, =gBattleFrontierTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 @08165DF2:
 	str r0, [r1]
 	bl sub_8165CB4
@@ -781018,7 +781018,7 @@ sub_8194CE4: ; 8194CE4
 	thumb_func_start sub_8194D48
 sub_8194D48: ; 8194D48
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldr r1, =0x0203bc88
 	ldr r0, =gBattleFrontierTrainers
@@ -794214,7 +794214,7 @@ sub_819B484: ; 819B484
 	lsrs r0, 24
 	str r0, [sp, 0x18]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r1, [r4]
 	movs r0, 0x3
@@ -794394,7 +794394,7 @@ sub_819B63C: ; 819B63C
 	movs r1, 0
 	strb r1, [r0]
 	ldr r2, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r2]
 	ldr r0, =0x03005d90
 	ldr r1, [r0]
@@ -815476,13 +815476,13 @@ sub_81A63CC: ; 81A63CC
 	cmp r0, 0x2
 	beq @081A63FC
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	b @081A6400
 	.align 2, 0
 	.pool
 @081A63FC:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 @081A6400:
 	str r0, [r1]
 	movs r7, 0
@@ -815584,7 +815584,7 @@ sub_81A64C4: ; 81A64C4
 	cmp r0, 0x2
 	bne @081A6500
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r1]
 	movs r2, 0x1E
 	str r2, [sp, 0x14]
@@ -815593,7 +815593,7 @@ sub_81A64C4: ; 81A64C4
 	.pool
 @081A6500:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	ldrb r1, [r2]
 	adds r0, r3, 0
@@ -816020,7 +816020,7 @@ sub_81A67EC: ; 81A67EC
 	movs r2, 0x1
 @081A6878:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	mov r1, r9
 	ldr r0, [r1]
@@ -816217,7 +816217,7 @@ sub_81A6A08: ; 81A6A08
 	push {r7}
 	sub sp, 0x18
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	movs r4, 0
 	add r5, sp, 0x14
@@ -816334,7 +816334,7 @@ sub_81A6AEC: ; 81A6AEC
 	sub sp, 0x8
 	movs r7, 0
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	str r0, [r1]
 	movs r4, 0
 	movs r1, 0
@@ -816504,13 +816504,13 @@ sub_81A6C1C: ; 81A6C1C
 	cmp r0, 0x2
 	beq @081A6C48
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085D97BC
+	ldr r0, =gBattleFrontierMons
 	b @081A6C4C
 	.align 2, 0
 	.pool
 @081A6C48:
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 @081A6C4C:
 	str r0, [r1]
 	movs r4, 0
@@ -854010,7 +854010,7 @@ sub_81B9EC0: ; 81B9EC0
 	adds r1, 0x18
 	str r1, [sp, 0x2C]
 	ldr r5, =0x0203bc8c
-	ldr r4, =gUnknown_085DE02C
+	ldr r4, =gSlateportBattleTentMons
 	movs r2, 0
 	adds r3, r1, 0
 	mov r1, r9
@@ -854198,7 +854198,7 @@ sub_81BA040: ; 81BA040
 	ldr r0, =gSlateportBattleTentTrainers
 	str r0, [r1]
 	ldr r1, =0x0203bc8c
-	ldr r0, =gUnknown_085DE02C
+	ldr r0, =gSlateportBattleTentMons
 	str r0, [r1]
 	ldr r7, =0x03005d90
 	ldr r1, =0x0000ffff

constants/battle_frontier_constants.s

@@ -0,0 +1,70 @@
+	.set F_EV_SPREAD_HP,         1 << 0
+	.set F_EV_SPREAD_ATTACK,     1 << 1
+	.set F_EV_SPREAD_DEFENSE,    1 << 2
+	.set F_EV_SPREAD_SPEED,      1 << 3
+	.set F_EV_SPREAD_SP_ATTACK,  1 << 4
+	.set F_EV_SPREAD_SP_DEFENSE, 1 << 5
+
+	.set BATTLE_FRONTIER_ITEM_NONE,           0
+	.set BATTLE_FRONTIER_ITEM_KINGS_ROCK,     1
+	.set BATTLE_FRONTIER_ITEM_SITRUS_BERRY,   2
+	.set BATTLE_FRONTIER_ITEM_ORAN_BERRY,     3
+	.set BATTLE_FRONTIER_ITEM_CHESTO_BERRY,   4
+	.set BATTLE_FRONTIER_ITEM_HARD_STONE,     5
+	.set BATTLE_FRONTIER_ITEM_FOCUS_BAND,     6
+	.set BATTLE_FRONTIER_ITEM_PERSIM_BERRY,   7
+	.set BATTLE_FRONTIER_ITEM_MIRACLE_SEED,   8
+	.set BATTLE_FRONTIER_ITEM_BERRY_JUICE,    9
+	.set BATTLE_FRONTIER_ITEM_MACHO_BRACE,    10
+	.set BATTLE_FRONTIER_ITEM_SILVER_POWDER,  11
+	.set BATTLE_FRONTIER_ITEM_CHERI_BERRY,    12
+	.set BATTLE_FRONTIER_ITEM_BLACK_GLASSES,  13
+	.set BATTLE_FRONTIER_ITEM_BLACK_BELT,     14
+	.set BATTLE_FRONTIER_ITEM_SOUL_DEW,       15
+	.set BATTLE_FRONTIER_ITEM_CHOICE_BAND,    16
+	.set BATTLE_FRONTIER_ITEM_MAGNET,         17
+	.set BATTLE_FRONTIER_ITEM_SILK_SCARF,     18
+	.set BATTLE_FRONTIER_ITEM_WHITE_HERB,     19
+	.set BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, 20
+	.set BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH, 21
+	.set BATTLE_FRONTIER_ITEM_MYSTIC_WATER,   22
+	.set BATTLE_FRONTIER_ITEM_SHARP_BEAK,     23
+	.set BATTLE_FRONTIER_ITEM_QUICK_CLAW,     24
+	.set BATTLE_FRONTIER_ITEM_LEFTOVERS,      25
+	.set BATTLE_FRONTIER_ITEM_RAWST_BERRY,    26
+	.set BATTLE_FRONTIER_ITEM_LIGHT_BALL,     27
+	.set BATTLE_FRONTIER_ITEM_POISON_BARB,    28
+	.set BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, 29
+	.set BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,   30
+	.set BATTLE_FRONTIER_ITEM_SPELL_TAG,      31
+	.set BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,  32
+	.set BATTLE_FRONTIER_ITEM_LEPPA_BERRY,    33
+	.set BATTLE_FRONTIER_ITEM_SCOPE_LENS,     34
+	.set BATTLE_FRONTIER_ITEM_TWISTED_SPOON,  35
+	.set BATTLE_FRONTIER_ITEM_METAL_COAT,     36
+	.set BATTLE_FRONTIER_ITEM_MENTAL_HERB,    37
+	.set BATTLE_FRONTIER_ITEM_CHARCOAL,       38
+	.set BATTLE_FRONTIER_ITEM_PECHA_BERRY,    39
+	.set BATTLE_FRONTIER_ITEM_SOFT_SAND,      40
+	.set BATTLE_FRONTIER_ITEM_LUM_BERRY,      41
+	.set BATTLE_FRONTIER_ITEM_DRAGON_SCALE,   42
+	.set BATTLE_FRONTIER_ITEM_DRAGON_FANG,    43
+	.set BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,   44
+	.set BATTLE_FRONTIER_ITEM_WIKI_BERRY,     45
+	.set BATTLE_FRONTIER_ITEM_SEA_INCENSE,    46
+	.set BATTLE_FRONTIER_ITEM_SHELL_BELL,     47
+	.set BATTLE_FRONTIER_ITEM_SALAC_BERRY,    48
+	.set BATTLE_FRONTIER_ITEM_LANSAT_BERRY,   49
+	.set BATTLE_FRONTIER_ITEM_APICOT_BERRY,   50
+	.set BATTLE_FRONTIER_ITEM_STARF_BERRY,    51
+	.set BATTLE_FRONTIER_ITEM_LIECHI_BERRY,   52
+	.set BATTLE_FRONTIER_ITEM_STICK,          53
+	.set BATTLE_FRONTIER_ITEM_LAX_INCENSE,    54
+	.set BATTLE_FRONTIER_ITEM_AGUAV_BERRY,    55
+	.set BATTLE_FRONTIER_ITEM_FIGY_BERRY,     56
+	.set BATTLE_FRONTIER_ITEM_THICK_CLUB,     57
+	.set BATTLE_FRONTIER_ITEM_MAGO_BERRY,     58
+	.set BATTLE_FRONTIER_ITEM_METAL_POWDER,   59
+	.set BATTLE_FRONTIER_ITEM_PETAYA_BERRY,   60
+	.set BATTLE_FRONTIER_ITEM_LUCKY_PUNCH,    61
+	.set BATTLE_FRONTIER_ITEM_GANLON_BERRY,   62

constants/constants.s

@@ -11,3 +11,4 @@
 	.include "constants/battle_move_constants.s"
 	.include "constants/easy_chat_constants.s"
 	.include "constants/trainer_class_constants.s"
+	.include "constants/battle_frontier_constants.s"

constants/pokemon_data_constants.s

@@ -1,3 +1,29 @@
+	.set NATURE_HARDY,   0
+	.set NATURE_LONELY,  1
+	.set NATURE_BRAVE,   2
+	.set NATURE_ADAMANT, 3
+	.set NATURE_NAUGHTY, 4
+	.set NATURE_BOLD,    5
+	.set NATURE_DOCILE,  6
+	.set NATURE_RELAXED, 7
+	.set NATURE_IMPISH,  8
+	.set NATURE_LAX,     9
+	.set NATURE_TIMID,   10
+	.set NATURE_HASTY,   11
+	.set NATURE_SERIOUS, 12
+	.set NATURE_JOLLY,   13
+	.set NATURE_NAIVE,   14
+	.set NATURE_MODEST,  15
+	.set NATURE_MILD,    16
+	.set NATURE_QUIET,   17
+	.set NATURE_BASHFUL, 18
+	.set NATURE_RASH,    19
+	.set NATURE_CALM,    20
+	.set NATURE_GENTLE,  21
+	.set NATURE_SASSY,   22
+	.set NATURE_CAREFUL, 23
+	.set NATURE_QUIRKY,  24
+
 	.set GROWTH_MEDIUM_FAST, 0x00
 	.set GROWTH_ERRATIC,     0x01
 	.set GROWTH_FLUCTUATING, 0x02

data/battle_frontier/battle_frontier_trainer_mons.s

@@ -1,3 +1,5 @@
+	.align 1, 0
+
 gBattleFrontierTrainerMons_Brady: ; 85CED2E
 	.2byte 0
 	.2byte 1

data/battle_frontier/fallarbor_battle_tent_mons.s

@@ -0,0 +1,317 @@
+	.align 2, 0
+
+gFallarborBattleTentMons: ; 85DF69C
+; 0
+	.2byte SPECIES_NUMEL
+	.2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY
+	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_QUIET
+
+; 1
+	.2byte SPECIES_LINOONE
+	.2byte MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM
+	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_SASSY
+
+; 2
+	.2byte SPECIES_PLUSLE
+	.2byte MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS
+	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MODEST
+
+; 3
+	.2byte SPECIES_POOCHYENA
+	.2byte MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION
+	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAUGHTY
+
+; 4
+	.2byte SPECIES_KECLEON
+	.2byte MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM
+	.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_MODEST
+
+; 5
+	.2byte SPECIES_MAGIKARP
+	.2byte MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE
+	.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 6
+	.2byte SPECIES_SOLROCK
+	.2byte MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE
+	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_SASSY
+
+; 7
+	.2byte SPECIES_MAKUHITA
+	.2byte MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT
+	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 8
+	.2byte SPECIES_MACHOKE
+	.2byte MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAIVE
+
+; 9
+	.2byte SPECIES_NINCADA
+	.2byte MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG
+	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_SERIOUS
+
+; 10
+	.2byte SPECIES_BEAUTIFLY
+	.2byte MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_QUIRKY
+
+; 11
+	.2byte SPECIES_DUSTOX
+	.2byte MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_DOCILE
+
+; 12
+	.2byte SPECIES_ILLUMISE
+	.2byte MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 13
+	.2byte SPECIES_VOLBEAT
+	.2byte MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW
+	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 14
+	.2byte SPECIES_NINJASK
+	.2byte MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_TIMID
+
+; 15
+	.2byte SPECIES_NINJASK
+	.2byte MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE
+	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 16
+	.2byte SPECIES_ARON
+	.2byte MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_LONELY
+
+; 17
+	.2byte SPECIES_ARON
+	.2byte MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP
+	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_GENTLE
+
+; 18
+	.2byte SPECIES_ELECTRIKE
+	.2byte MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_HASTY
+
+; 19
+	.2byte SPECIES_MAGNEMITE
+	.2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK
+	.byte BATTLE_FRONTIER_ITEM_MAGNET
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_QUIET
+
+; 20
+	.2byte SPECIES_VOLTORB
+	.2byte MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM
+	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MODEST
+
+; 21
+	.2byte SPECIES_WHISMUR
+	.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 22
+	.2byte SPECIES_LOUDRED
+	.2byte MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR
+	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 23
+	.2byte SPECIES_LINOONE
+	.2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL
+	.byte BATTLE_FRONTIER_ITEM_MAGNET
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 24
+	.2byte SPECIES_MIGHTYENA
+	.2byte MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER
+	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_JOLLY
+
+; 25
+	.2byte SPECIES_SWABLU
+	.2byte MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 26
+	.2byte SPECIES_SKARMORY
+	.2byte MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT
+	.byte BATTLE_FRONTIER_ITEM_METAL_COAT
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BOLD
+
+; 27
+	.2byte SPECIES_GOLBAT
+	.2byte MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE
+	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_BOLD
+
+; 28
+	.2byte SPECIES_WINGULL
+	.2byte MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MODEST
+
+; 29
+	.2byte SPECIES_PELIPPER
+	.2byte MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN
+	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 30
+	.2byte SPECIES_BARBOACH
+	.2byte MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT
+	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 31
+	.2byte SPECIES_WAILMER
+	.2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE
+	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_QUIET
+
+; 32
+	.2byte SPECIES_MARILL
+	.2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 33
+	.2byte SPECIES_GOLDEEN
+	.2byte MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT
+	.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_HASTY
+
+; 34
+	.2byte SPECIES_GOLDEEN
+	.2byte MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_CAREFUL
+
+; 35
+	.2byte SPECIES_TRAPINCH
+	.2byte MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH
+	.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 36
+	.2byte SPECIES_BALTOY
+	.2byte MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_JOLLY
+
+; 37
+	.2byte SPECIES_GRAVELER
+	.2byte MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT
+	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 38
+	.2byte SPECIES_SANDSHREW
+	.2byte MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH
+	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_JOLLY
+
+; 39
+	.2byte SPECIES_SWALOT
+	.2byte MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BRAVE
+
+; 40
+	.2byte SPECIES_SHROOMISH
+	.2byte MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED
+	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_IMPISH
+
+; 41
+	.2byte SPECIES_KIRLIA
+	.2byte MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER
+	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 42
+	.2byte SPECIES_LOMBRE
+	.2byte MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH
+	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_BASHFUL
+
+; 43
+	.2byte SPECIES_NUZLEAF
+	.2byte MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 44
+	.2byte SPECIES_CACNEA
+	.2byte MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT

data/battle_frontier/fallarbor_battle_tent_trainer_mons.s

@@ -1,3 +1,5 @@
+	.align 1, 0
+
 gFallarborBattleTentTrainerMons_Amber: ; 85DEEF8
 	.2byte 39
 	.2byte 40

data/battle_frontier/slateport_battle_tent_mons.s

@@ -0,0 +1,492 @@
+	.align 2, 0
+
+gSlateportBattleTentMons: ; 85DE02C
+; 0
+	.2byte SPECIES_ZIGZAGOON
+	.2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE
+	.byte BATTLE_FRONTIER_ITEM_CHOICE_BAND
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_JOLLY
+
+; 1
+	.2byte SPECIES_ZIGZAGOON
+	.2byte MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_JOLLY
+
+; 2
+	.2byte SPECIES_BEAUTIFLY
+	.2byte MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MODEST
+
+; 3
+	.2byte SPECIES_DUSTOX
+	.2byte MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST
+	.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 4
+	.2byte SPECIES_WAILMER
+	.2byte MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL
+	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 5
+	.2byte SPECIES_WAILMER
+	.2byte MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE
+	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 6
+	.2byte SPECIES_MARILL
+	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
+	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_IMPISH
+
+; 7
+	.2byte SPECIES_WINGULL
+	.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING
+	.byte BATTLE_FRONTIER_ITEM_METAL_COAT
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAIVE
+
+; 8
+	.2byte SPECIES_PELIPPER
+	.2byte MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_MODEST
+
+; 9
+	.2byte SPECIES_CACNEA
+	.2byte MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE
+	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
+	.byte F_EV_SPREAD_SPEED
+	.4byte NATURE_JOLLY
+
+; 10
+	.2byte SPECIES_LOMBRE
+	.2byte MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB
+	.byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 11
+	.2byte SPECIES_LOTAD
+	.2byte MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN
+	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_DOCILE
+
+; 12
+	.2byte SPECIES_SEEDOT
+	.2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE
+	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_TIMID
+
+; 13
+	.2byte SPECIES_NUZLEAF
+	.2byte MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_LONELY
+
+; 14
+	.2byte SPECIES_NINJASK
+	.2byte MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 15
+	.2byte SPECIES_NINJASK
+	.2byte MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAUGHTY
+
+; 16
+	.2byte SPECIES_GRAVELER
+	.2byte MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BRAVE
+
+; 17
+	.2byte SPECIES_BALTOY
+	.2byte MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAIVE
+
+; 18
+	.2byte SPECIES_MIGHTYENA
+	.2byte MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE
+	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_CALM
+
+; 19
+	.2byte SPECIES_MIGHTYENA
+	.2byte MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG
+	.byte BATTLE_FRONTIER_ITEM_SHELL_BELL
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_LONELY
+
+; 20
+	.2byte SPECIES_LINOONE
+	.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_JOLLY
+
+; 21
+	.2byte SPECIES_GOLDEEN
+	.2byte MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_CALM
+
+; 22
+	.2byte SPECIES_ELECTRIKE
+	.2byte MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH
+	.byte BATTLE_FRONTIER_ITEM_MAGNET
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_MODEST
+
+; 23
+	.2byte SPECIES_VOLTORB
+	.2byte MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK
+	.4byte NATURE_MILD
+
+; 24
+	.2byte SPECIES_ARON
+	.2byte MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_NAUGHTY
+
+; 25
+	.2byte SPECIES_ARON
+	.2byte MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR
+	.byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 26
+	.2byte SPECIES_TRAPINCH
+	.2byte MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BRAVE
+
+; 27
+	.2byte SPECIES_CACNEA
+	.2byte MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_TIMID
+
+; 28
+	.2byte SPECIES_TAILLOW
+	.2byte MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR
+	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 29
+	.2byte SPECIES_SWELLOW
+	.2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_IMPISH
+
+; 30
+	.2byte SPECIES_GOLBAT
+	.2byte MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY
+	.byte BATTLE_FRONTIER_ITEM_SPELL_TAG
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_TIMID
+
+; 31
+	.2byte SPECIES_LOUDRED
+	.2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 32
+	.2byte SPECIES_SPINDA
+	.2byte MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 33
+	.2byte SPECIES_MAGNEMITE
+	.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK
+	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_SERIOUS
+
+; 34
+	.2byte SPECIES_WHISMUR
+	.2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM
+	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 35
+	.2byte SPECIES_MAKUHITA
+	.2byte MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 36
+	.2byte SPECIES_NUMEL
+	.2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_MODEST
+
+; 37
+	.2byte SPECIES_BARBOACH
+	.2byte MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN
+	.byte BATTLE_FRONTIER_ITEM_SEA_INCENSE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_JOLLY
+
+; 38
+	.2byte SPECIES_TENTACOOL
+	.2byte MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER
+	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 39
+	.2byte SPECIES_VIGOROTH
+	.2byte MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN
+	.byte BATTLE_FRONTIER_ITEM_AGUAV_BERRY
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 40
+	.2byte SPECIES_MAGIKARP
+	.2byte MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE
+	.byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 41
+	.2byte SPECIES_SEVIPER
+	.2byte MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 42
+	.2byte SPECIES_SOLROCK
+	.2byte MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE
+	.byte BATTLE_FRONTIER_ITEM_HARD_STONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 43
+	.2byte SPECIES_KECLEON
+	.2byte MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 44
+	.2byte SPECIES_KECLEON
+	.2byte MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH
+	.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_CALM
+
+; 45
+	.2byte SPECIES_SHROOMISH
+	.2byte MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN
+	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MODEST
+
+; 46
+	.2byte SPECIES_SHROOMISH
+	.2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED
+	.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
+	.byte F_EV_SPREAD_ATTACK
+	.4byte NATURE_BRAVE
+
+; 47
+	.2byte SPECIES_LOMBRE
+	.2byte MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_LONELY
+
+; 48
+	.2byte SPECIES_NUMEL
+	.2byte MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
+	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_MODEST
+
+; 49
+	.2byte SPECIES_TRAPINCH
+	.2byte MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BRAVE
+
+; 50
+	.2byte SPECIES_PELIPPER
+	.2byte MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY
+	.byte BATTLE_FRONTIER_ITEM_WIKI_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 51
+	.2byte SPECIES_WINGULL
+	.2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND
+	.byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 52
+	.2byte SPECIES_MARILL
+	.2byte MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN
+	.byte BATTLE_FRONTIER_ITEM_GANLON_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 53
+	.2byte SPECIES_SKITTY
+	.2byte MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM
+	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_CAREFUL
+
+; 54
+	.2byte SPECIES_SEVIPER
+	.2byte MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_BRAVE
+
+; 55
+	.2byte SPECIES_GOLBAT
+	.2byte MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG
+	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_HARDY
+
+; 56
+	.2byte SPECIES_RALTS
+	.2byte MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER
+	.byte BATTLE_FRONTIER_ITEM_MAGO_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_TIMID
+
+; 57
+	.2byte SPECIES_SANDSHREW
+	.2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL
+	.byte BATTLE_FRONTIER_ITEM_SOFT_SAND
+	.byte 0
+	.4byte NATURE_HARDY
+
+; 58
+	.2byte SPECIES_SWALOT
+	.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_IMPISH
+
+; 59
+	.2byte SPECIES_VOLBEAT
+	.2byte MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_HARDY
+
+; 60
+	.2byte SPECIES_ILLUMISE
+	.2byte MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT
+	.byte BATTLE_FRONTIER_ITEM_CHERI_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 61
+	.2byte SPECIES_KADABRA
+	.2byte MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_QUIRKY
+
+; 62
+	.2byte SPECIES_KIRLIA
+	.2byte MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL
+	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_CAREFUL
+
+; 63
+	.2byte SPECIES_BRELOOM
+	.2byte MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_NAIVE
+
+; 64
+	.2byte SPECIES_PLUSLE
+	.2byte MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL
+	.byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_LONELY
+
+; 65
+	.2byte SPECIES_PLUSLE
+	.2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MILD
+
+; 66
+	.2byte SPECIES_ELECTRIKE
+	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE
+	.byte BATTLE_FRONTIER_ITEM_APICOT_BERRY
+	.byte F_EV_SPREAD_SPEED
+	.4byte NATURE_TIMID
+
+; 67
+	.2byte SPECIES_SWABLU
+	.2byte MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_JOLLY
+
+; 68
+	.2byte SPECIES_MACHOP
+	.2byte MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT
+	.byte BATTLE_FRONTIER_ITEM_BLACK_BELT
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 69
+	.2byte SPECIES_MACHOKE
+	.2byte MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST

data/battle_frontier/slateport_battle_tent_trainer_mons.s

@@ -1,3 +1,5 @@
+	.align 1, 0
+
 gSlateportBattleTentTrainerMons_Jolie: ; 85DD70C
 	.2byte 9
 	.2byte 10

data/battle_frontier/verdanturf_battle_tent_mons.s

@@ -0,0 +1,317 @@
+	.align 2, 0
+
+gVerdanturfBattleTentMons: ; 85DEC28
+; 0
+	.2byte SPECIES_POOCHYENA
+	.2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL
+	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_NAUGHTY
+
+; 1
+	.2byte SPECIES_ZIGZAGOON
+	.2byte MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT
+	.byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_ADAMANT
+
+; 2
+	.2byte SPECIES_DUSTOX
+	.2byte MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH
+	.byte BATTLE_FRONTIER_ITEM_SILVER_POWDER
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE
+	.4byte NATURE_MODEST
+
+; 3
+	.2byte SPECIES_TAILLOW
+	.2byte MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL
+	.byte BATTLE_FRONTIER_ITEM_ORAN_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_RELAXED
+
+; 4
+	.2byte SPECIES_SHROOMISH
+	.2byte MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH
+	.byte BATTLE_FRONTIER_ITEM_LUM_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_RASH
+
+; 5
+	.2byte SPECIES_MACHOP
+	.2byte MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE
+	.byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_LONELY
+
+; 6
+	.2byte SPECIES_MAGIKARP
+	.2byte MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE
+	.byte BATTLE_FRONTIER_ITEM_SILK_SCARF
+	.byte F_EV_SPREAD_ATTACK
+	.4byte NATURE_HARDY
+
+; 7
+	.2byte SPECIES_BARBOACH
+	.2byte MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK
+	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
+	.byte F_EV_SPREAD_SPEED
+	.4byte NATURE_HASTY
+
+; 8
+	.2byte SPECIES_WINGULL
+	.2byte MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_DRAGON_FANG
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_IMPISH
+
+; 9
+	.2byte SPECIES_ARON
+	.2byte MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_PECHA_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_HARDY
+
+; 10
+	.2byte SPECIES_NUMEL
+	.2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL
+	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_SASSY
+
+; 11
+	.2byte SPECIES_SWALOT
+	.2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA
+	.byte BATTLE_FRONTIER_ITEM_POISON_BARB
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_BOLD
+
+; 12
+	.2byte SPECIES_KECLEON
+	.2byte MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND
+	.byte BATTLE_FRONTIER_ITEM_LAX_INCENSE
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_QUIET
+
+; 13
+	.2byte SPECIES_BALTOY
+	.2byte MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN
+	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAUGHTY
+
+; 14
+	.2byte SPECIES_NINJASK
+	.2byte MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE
+	.byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_SASSY
+
+; 15
+	.2byte SPECIES_MAKUHITA
+	.2byte MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_SALAC_BERRY
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAUGHTY
+
+; 16
+	.2byte SPECIES_SWABLU
+	.2byte MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_MILD
+
+; 17
+	.2byte SPECIES_GOLDEEN
+	.2byte MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM
+	.byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_GENTLE
+
+; 18
+	.2byte SPECIES_LOTAD
+	.2byte MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT
+	.byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 19
+	.2byte SPECIES_NUMEL
+	.2byte MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL
+	.byte BATTLE_FRONTIER_ITEM_CHARCOAL
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK
+	.4byte NATURE_RELAXED
+
+; 20
+	.2byte SPECIES_LINOONE
+	.2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_IMPISH
+
+; 21
+	.2byte SPECIES_SEVIPER
+	.2byte MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER
+	.byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_LONELY
+
+; 22
+	.2byte SPECIES_SKARMORY
+	.2byte MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY
+	.byte BATTLE_FRONTIER_ITEM_MACHO_BRACE
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_BASHFUL
+
+; 23
+	.2byte SPECIES_SWELLOW
+	.2byte MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC
+	.byte BATTLE_FRONTIER_ITEM_SHARP_BEAK
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_NAUGHTY
+
+; 24
+	.2byte SPECIES_GOLDEEN
+	.2byte MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE
+	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_GENTLE
+
+; 25
+	.2byte SPECIES_ELECTRIKE
+	.2byte MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_MILD
+
+; 26
+	.2byte SPECIES_NUZLEAF
+	.2byte MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF
+	.byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_BOLD
+
+; 27
+	.2byte SPECIES_ARON
+	.2byte MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_QUICK_CLAW
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_MODEST
+
+; 28
+	.2byte SPECIES_MIGHTYENA
+	.2byte MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_KINGS_ROCK
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 29
+	.2byte SPECIES_SOLROCK
+	.2byte MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE
+	.byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_ADAMANT
+
+; 30
+	.2byte SPECIES_GRAVELER
+	.2byte MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_IMPISH
+
+; 31
+	.2byte SPECIES_KADABRA
+	.2byte MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS
+	.byte BATTLE_FRONTIER_ITEM_FOCUS_BAND
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP
+	.4byte NATURE_QUIET
+
+; 32
+	.2byte SPECIES_VOLTORB
+	.2byte MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_BASHFUL
+
+; 33
+	.2byte SPECIES_MAGNEMITE
+	.2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE
+	.byte BATTLE_FRONTIER_ITEM_MAGNET
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_SERIOUS
+
+; 34
+	.2byte SPECIES_PELIPPER
+	.2byte MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT
+	.byte BATTLE_FRONTIER_ITEM_FIGY_BERRY
+	.byte 0
+	.4byte NATURE_BRAVE
+
+; 35
+	.2byte SPECIES_LOUDRED
+	.2byte MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH
+	.byte BATTLE_FRONTIER_ITEM_LEFTOVERS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_CALM
+
+; 36
+	.2byte SPECIES_MARILL
+	.2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM
+	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_JOLLY
+
+; 37
+	.2byte SPECIES_TRAPINCH
+	.2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK
+	.byte BATTLE_FRONTIER_ITEM_NONE
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_NAUGHTY
+
+; 38
+	.2byte SPECIES_TENTACOOL
+	.2byte MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP
+	.4byte NATURE_RELAXED
+
+; 39
+	.2byte SPECIES_VIGOROTH
+	.2byte MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER
+	.byte BATTLE_FRONTIER_ITEM_MENTAL_HERB
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK
+	.4byte NATURE_QUIRKY
+
+; 40
+	.2byte SPECIES_WAILMER
+	.2byte MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT
+	.byte BATTLE_FRONTIER_ITEM_WHITE_HERB
+	.byte F_EV_SPREAD_HP
+	.4byte NATURE_RELAXED
+
+; 41
+	.2byte SPECIES_ILLUMISE
+	.2byte MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE
+	.byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_QUIRKY
+
+; 42
+	.2byte SPECIES_MACHOKE
+	.2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST
+	.byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY
+	.byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK
+	.4byte NATURE_CALM
+
+; 43
+	.2byte SPECIES_WHISMUR
+	.2byte MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR
+	.byte BATTLE_FRONTIER_ITEM_RAWST_BERRY
+	.byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED
+	.4byte NATURE_QUIRKY
+
+; 44
+	.2byte SPECIES_CACNEA
+	.2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH
+	.byte BATTLE_FRONTIER_ITEM_SCOPE_LENS
+	.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
+	.4byte NATURE_SERIOUS

data/battle_frontier/verdanturf_battle_tent_trainer_mons.s

@@ -1,3 +1,5 @@
+	.align 1, 0
+
 gVerdanturfBattleTentTrainerMons_Brenna: ; 85DE48C
 	.2byte 4
 	.2byte 11

data/data2.s

@@ -7119,8 +7119,8 @@ gUnknown_085CEC30: ; 85CEC30
 ; 85D5ACC
 	.include "data/battle_frontier/battle_frontier_trainers.s"
 
-gUnknown_085D97BC: ; 85D97BC
+; 85D97BC
-	.incbin "base_emerald.gba", 0x5d97bc, 0x3720
+	.include "data/battle_frontier/battle_frontier_mons.s"
 
 gUnknown_085DCEDC: ; 85DCEDC
 	.incbin "base_emerald.gba", 0x5dcedc, 0x1e
@@ -7158,8 +7158,8 @@ gUnknown_085DD6DC: ; 85DD6DC
 ; 85DDA14
 	.include "data/battle_frontier/slateport_battle_tent_trainers.s"
 
-gUnknown_085DE02C: ; 85DE02C
+; 85DE02C
-	.incbin "base_emerald.gba", 0x5de02c, 0x460
+	.include "data/battle_frontier/slateport_battle_tent_mons.s"
 
 ; 85DE48C
 	.include "data/battle_frontier/verdanturf_battle_tent_trainer_mons.s"
@@ -7167,8 +7167,8 @@ gUnknown_085DE02C: ; 85DE02C
 ; 85DE610
 	.include "data/battle_frontier/verdanturf_battle_tent_trainers.s"
 
-gUnknown_085DEC28: ; 85DEC28
+; 85DEC28
-	.incbin "base_emerald.gba", 0x5dec28, 0x2d0
+	.include "data/battle_frontier/verdanturf_battle_tent_mons.s"
 
 ; 85DEEF8
 	.include "data/battle_frontier/fallarbor_battle_tent_trainer_mons.s"
@@ -7176,8 +7176,8 @@ gUnknown_085DEC28: ; 85DEC28
 ; 85DF084
 	.include "data/battle_frontier/fallarbor_battle_tent_trainers.s"
 
-gUnknown_085DF69C: ; 85DF69C
+; 85DF69C
-	.incbin "base_emerald.gba", 0x5df69c, 0x2d0
+	.include "data/battle_frontier/fallarbor_battle_tent_mons.s"
 
 gUnknown_085DF96C: ; 85DF96C
 	.incbin "base_emerald.gba", 0x5df96c, 0x40