Fixed some trainer parties

SoupPotato · Feb 11, 2024 · 033f26b · 033f26b
1 parent ade53ce
commit 033f26b
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -622,7 +622,7 @@ LtSurgeGroup:
 	db TRAINERTYPE_MOVES
 	db 59, RAICHU,     THUNDER_WAVE, IRON_TAIL, THUNDERBOLT, DOUBLE_TEAM
 	db 55, ELECTRODE,  THUNDER_WAVE, DOUBLE_TEAM, LIGHT_SCREEN, THUNDERBOLT
-	db 55, MAGNETON,   LOCK_ON, DOUBLE_TEAM, THUNDER_WAVE, ZAP_CANNON
+	db 55, MAGNETON,   LOCK_ON, DOUBLE_TEAM, TRI_ATTACK, ZAP_CANNON
 	db 55, ELECTRODE,  SCREECH, DOUBLE_TEAM, THUNDER, EXPLOSION
 	db 61, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, LOW_KICK
 	db -1 ; end
@@ -1347,14 +1347,14 @@ SchoolboyGroup:
 	;Normal Mode
 	db TRAINERTYPE_MOVES
 	db 47, ELECTRODE,  SCREECH, THUNDERBOLT, ROLLOUT, LIGHT_SCREEN
-	db 47, ARCANINE,  SUNNY_DAY, ROAR, TAKE_DOWN, FLAMETHROWER
+	db 47, ARCANINE,   SUNNY_DAY, ROAR, TAKE_DOWN, FLAMETHROWER
 	db 49, VILEPLUME,  SOLARBEAM, SLEEP_POWDER, SLUDGE_BOMB, MOONLIGHT
 	db $fe ; delimiter
 	
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 57, ELECTRODE,  SCREECH, THUNDERBOLT, ROLLOUT, LIGHT_SCREEN
-	db 57, ARCANINE,  SUNNY_DAY, ROAR, TAKE_DOWN, FLAMETHROWER
+	db 57, ARCANINE,   SUNNY_DAY, ROAR, TAKE_DOWN, FLAMETHROWER
 	db 59, VILEPLUME,  SOLARBEAM, SLEEP_POWDER, SLUDGE_BOMB, MOONLIGHT
 	db -1 ; end
 
@@ -2120,7 +2120,7 @@ LassGroup:
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 56, SKIPLOOM,    GIGA_DRAIN, STUN_SPORE, GUST, DOUBLE_EDGE
-	db 57, HOPPIP,    GIGA_DRAIN, STUN_SPORE, GUST, DOUBLE_EDGE
+	db 57, HOPPIP,      GIGA_DRAIN, STUN_SPORE, GUST, DOUBLE_EDGE
 	db 58, JUMPLUFF,    GIGA_DRAIN, STUN_SPORE, GUST, DOUBLE_EDGE
 	db -1 ; end
 
@@ -2265,13 +2265,13 @@ LassGroup:
 	;Normal Mode
 	db TRAINERTYPE_MOVES
 	db 49, VILEPLUME,  GIGA_DRAIN, SLEEP_POWDER, SLUDGE_BOMB, MOONLIGHT
-	db 52, MAROWAK,  BONEMERANG, DOUBLE_EDGE, IRON_TAIL, CURSE
+	db 52, MAROWAK,    BONEMERANG, DOUBLE_EDGE, IRON_TAIL, CURSE
 	db $fe ; delimiter
 	
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 59, VILEPLUME,  GIGA_DRAIN, SLEEP_POWDER, SLUDGE_BOMB, MOONLIGHT
-	db 62, MAROWAK,  BONEMERANG, DOUBLE_EDGE, IRON_TAIL, CURSE
+	db 62, MAROWAK,    BONEMERANG, DOUBLE_EDGE, IRON_TAIL, CURSE
 	db -1 ; end
 
 
@@ -2535,7 +2535,7 @@ CooltrainerMGroup:
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 37, CHARMELEON, FLAMETHROWER, SMOKESCREEN, DRAGONBREATH, SCARY_FACE
-	db 37, MAGNETON, THUNDERBOLT, TRI_ATTACK, THUNDER_WAVE, SUPERSONIC
+	db 37, MAGNETON,   THUNDERBOLT, TRI_ATTACK, THUNDER_WAVE, SUPERSONIC
 	db -1 ; end
 
 	; COOLTRAINERM (16)
@@ -4300,13 +4300,13 @@ BugCatcherGroup:
 	;Normal Mode
 	db TRAINERTYPE_MOVES
 	db 51, BUTTERFREE,   STUN_SPORE, WHIRLWIND, PSYCHIC_M, SAFEGUARD
-	db 49, ARIADOS,   SWORDS_DANCE, PIN_MISSILE, SLUDGE_BOMB, NIGHT_SHADE
+	db 49, ARIADOS,      SWORDS_DANCE, PIN_MISSILE, SLUDGE_BOMB, NIGHT_SHADE
 	db $fe ; delimiter
 	
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 61, BUTTERFREE,   STUN_SPORE, WHIRLWIND, PSYCHIC_M, SAFEGUARD
-	db 59, ARIADOS,   SWORDS_DANCE, PIN_MISSILE, SLUDGE_BOMB, NIGHT_SHADE
+	db 59, ARIADOS,      SWORDS_DANCE, PIN_MISSILE, SLUDGE_BOMB, NIGHT_SHADE
 	db -1 ; end
 
 	; BUG_CATCHER (27)
@@ -4329,13 +4329,13 @@ BugCatcherGroup:
 	
 	;Normal Mode
 	db TRAINERTYPE_MOVES
-	db 55, BEEDRILL,   PIN_MISSILE, SLUDGE_BOMB, OUTRAGE, FOCUS_ENERGY
+	db 55, BEEDRILL,     PIN_MISSILE, SLUDGE_BOMB, OUTRAGE, FOCUS_ENERGY
 	db 54, BUTTERFREE,   SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, NIGHTMARE
 	db $fe ; delimiter
 	
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
-	db 65, BEEDRILL,   PIN_MISSILE, SLUDGE_BOMB, OUTRAGE, FOCUS_ENERGY
+	db 65, BEEDRILL,     PIN_MISSILE, SLUDGE_BOMB, OUTRAGE, FOCUS_ENERGY
 	db 64, BUTTERFREE,   SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, NIGHTMARE
 	db -1 ; end
 
@@ -7733,7 +7733,10 @@ PicnickerGroup:
 	db -1 ; end
 
 	; PICNICKER (27)
-	db "SELINA@",TRAINERTYPE_NORMAL
+	db "SELINA@",TRAINERTYPE_VARIABLE
+
+	;Normal Mode
+	db TRAINERTYPE_NORMAL
 	db 42, SUNFLORA
 	db $fe ; delimiter
 	
@@ -8037,13 +8040,13 @@ CamperGroup:
 	;Normal Mode
 	db TRAINERTYPE_MOVES
 	db 21, SKIPLOOM,   ABSORB, TACKLE, POISONPOWDER, LEECH_SEED
-	db 21, MARILL,   DEFENSE_CURL, WATER_GUN, ROLLOUT, BUBBLEBEAM
+	db 21, MARILL,     DEFENSE_CURL, WATER_GUN, ROLLOUT, BUBBLEBEAM
 	db $fe ; delimiter
 	
 	;Challenge Mode
 	db TRAINERTYPE_MOVES
 	db 26, SKIPLOOM,   ABSORB, TACKLE, POISONPOWDER, LEECH_SEED
-	db 26, MARILL,   DEFENSE_CURL, WATER_GUN, ROLLOUT, BUBBLEBEAM
+	db 26, MARILL,     DEFENSE_CURL, WATER_GUN, ROLLOUT, BUBBLEBEAM
 	db -1 ; end
 
 	; CAMPER (18)