Skip to content

Commit

Permalink
Adjusted RIVAL2 parties and DVs
Browse files Browse the repository at this point in the history
  • Loading branch information
SoupPotato committed Feb 14, 2024
1 parent a989da3 commit 15cb785
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion data/trainers/dvs.asm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ TrainerClassDVs:
dn 7, 8, 8, 8 ; SWIMMERF
dn 9, 8, 8, 8 ; SAILOR
dn 9, 8, 8, 8 ; SUPER_NERD
dn 13, 13, 13, 13 ; RIVAL2
dn 14, 14, 13, 13 ; RIVAL2
dn 9, 8, 8, 8 ; GUITARIST
dn 10, 8, 8, 8 ; HIKER
dn 9, 8, 8, 8 ; BIKER
Expand Down
12 changes: 6 additions & 6 deletions data/trainers/parties.asm
Original file line number Diff line number Diff line change
Expand Up @@ -5744,7 +5744,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 58, SNEASEL, ICY_WIND, SLASH, FEINT_ATTACK, FURY_CUTTER
db 59, GOLBAT, SLUDGE_BOMB, CRUNCH, CONFUSE_RAY, WING_ATTACK
db 58, MAGNETON, THUNDERBOLT, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 58, MAGNETON, THUNDERBOLT, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 60, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 60, ALAKAZAM, DISABLE, RECOVER, REFLECT, PSYCHIC_M
db 62, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SYNTHESIS
Expand All @@ -5767,7 +5767,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 58, SNEASEL, ICY_WIND, SLASH, FEINT_ATTACK, FURY_CUTTER
db 59, GOLBAT, SLUDGE_BOMB, CRUNCH, CONFUSE_RAY, WING_ATTACK
db 58, MAGNETON, THUNDERBOLT, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 58, MAGNETON, THUNDERBOLT, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 60, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 60, ALAKAZAM, DISABLE, RECOVER, REFLECT, PSYCHIC_M
db 62, TYPHLOSION, FLAMETHROWER, ROLLOUT, THUNDERPUNCH, SWIFT
Expand All @@ -5790,7 +5790,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 58, SNEASEL, ICY_WIND, SLASH, FEINT_ATTACK, FURY_CUTTER
db 59, GOLBAT, SLUDGE_BOMB, CRUNCH, CONFUSE_RAY, WING_ATTACK
db 58, MAGNETON, THUNDERBOLT, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 58, MAGNETON, THUNDERBOLT, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 60, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 60, ALAKAZAM, DISABLE, RECOVER, REFLECT, PSYCHIC_M
db 62, FERALIGATR, CRUNCH, SURF, ICE_BEAM, SLASH
Expand All @@ -5813,7 +5813,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 67, SNEASEL, ICY_WIND, SLASH, BEAT_UP, FURY_CUTTER
db 70, CROBAT, TOXIC, SLUDGE_BOMB, CONFUSE_RAY, WING_ATTACK
db 67, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 67, MAGNETON, THUNDER, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 68, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 68, ALAKAZAM, RECOVER, FIRE_PUNCH, PSYCHIC_M, REFLECT
db 72, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
Expand All @@ -5836,7 +5836,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 67, SNEASEL, ICY_WIND, SLASH, BEAT_UP, FURY_CUTTER
db 70, CROBAT, TOXIC, SLUDGE_BOMB, CONFUSE_RAY, WING_ATTACK
db 67, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 67, MAGNETON, THUNDER, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 68, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 68, ALAKAZAM, RECOVER, ICE_PUNCH, PSYCHIC_M, REFLECT
db 72, TYPHLOSION, SMOKESCREEN, ROLLOUT, FIRE_BLAST, THUNDERPUNCH
Expand All @@ -5859,7 +5859,7 @@ Rival2Group:
db TRAINERTYPE_MOVES
db 67, SNEASEL, ICY_WIND, SLASH, BEAT_UP, FURY_CUTTER
db 70, CROBAT, TOXIC, SLUDGE_BOMB, CONFUSE_RAY, WING_ATTACK
db 67, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK
db 67, MAGNETON, THUNDER, HIDDEN_POWER, THUNDER_WAVE, TRI_ATTACK
db 68, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
db 68, ALAKAZAM, RECOVER, THUNDERPUNCH, PSYCHIC_M, REFLECT
db 72, FERALIGATR, SURF, EARTHQUAKE, SLASH, CRUNCH
Expand Down

0 comments on commit 15cb785

Please sign in to comment.