diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 11a527db..38237f16 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -4,7 +4,7 @@ BrockData: db $FF, 11, GEODUDE, 12, DECILLA, 14, ONIX, 0 ; 0 badges db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1 - db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2 + db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2 db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3 db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4 db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0 ; 5 @@ -27,7 +27,7 @@ LtSurgeData: db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1 db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2 - db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3 + db $FF, 29, VOLTORB, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3 db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4 db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5 db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 1d3aa0f8..e163785e 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -21,7 +21,7 @@ SpecialTrainerMoves: db YUJIROU, 4 ; Yujirou 3 badges db 2, 1, DIG - db 3, 4, THUNDER_WAVE + db 3, 4, SING db 4, 2, PECK db 4, 3, CUT db 5, 3, WRAP @@ -33,8 +33,7 @@ SpecialTrainerMoves: db 1, 3, SCREECH db 1, 4, BODY_SLAM db 2, 4, DIG - db 3, 1, SING - db 3, 3, THUNDER_WAVE + db 3, 3, SING db 4, 2, PECK db 4, 3, CUT db 5, 2, SWORDS_DANCE @@ -136,7 +135,7 @@ SpecialTrainerMoves: db 0 db BROCK, 5 ; Brock 4 badges - db 1, 3, MEGA_PUNCH + db 1, 3, ROCK_SLIDE db 2, 1, SURF db 2, 4, HORN_ATTACK db 3, 2, BUBBLEBEAM @@ -148,11 +147,12 @@ SpecialTrainerMoves: db 0 db BROCK, 6 ; Brock 5 badges - db 1, 1, MEGA_PUNCH - db 1, 3, ROCK_SLIDE + db 1, 1, SELFDESTRUCT + db 1, 2, ROCK_SLIDE db 2, 3, SURF db 2, 4, ICE_BEAM db 3, 1, SURF + db 3, 2, ROCK_THROW db 3, 3, SWORDS_DANCE db 4, 1, SUBSTITUTE db 4, 4, DOUBLE_EDGE @@ -162,11 +162,11 @@ SpecialTrainerMoves: db 0 db BROCK, 7 ; Brock 6 badges - db 1, 1, MEGA_PUNCH - db 1, 2, ROCK_SLIDE + db 1, 1, SELFDESTRUCT db 2, 2, SURF db 2, 3, ICE_BEAM db 3, 1, SURF + db 3, 2, ROCK_THROW db 3, 3, SWORDS_DANCE db 4, 1, ROCK_SLIDE db 4, 3, DOUBLE_EDGE @@ -192,7 +192,12 @@ SpecialTrainerMoves: db 2, 2, THUNDER_WAVE db 0 + db RIVAL1, 14 ; Cerulean City Rival w/Eevee + db 1, 1, PECK + db 0 + db RIVAL1, 15 ; Cerulean City Rival w/Pikachu + db 1, 1, PECK db 4, 1, THUNDERSHOCK db 0 @@ -227,13 +232,19 @@ SpecialTrainerMoves: db RIVAL2, 2 ; SS Anne Rival w/Ivysaur db 3, 1, THUNDER_WAVE + db 4, 1, TACKLE db 0 db RIVAL2, 3 ; SS Anne Rival w/Charmeleon db 3, 1, THUNDER_WAVE db 0 + + db RIVAL2, 4 ; SS Anne Rival w/Eevee + db 1, 1, PECK + db 0 db RIVAL2, 5 ; SS Anne Rival w/Pikachu + db 1, 1, PECK db 4, 2, THUNDERSHOCK db 0 @@ -248,7 +259,7 @@ SpecialTrainerMoves: db 2, 1, THUNDERSHOCK db 3, 4, THUNDER_WAVE db 4, 3, THUNDERBOLT - db 5, 4, THUNDER_WAVE + db 4, 4, THUNDER_WAVE db 0 db LT_SURGE, 3 ; Surge 2 badges @@ -316,6 +327,7 @@ SpecialTrainerMoves: db RIVAL2, 6 ; Pokemon Tower Rival w/Wartortle db 1, 4, MIMIC + db 2, 1, BITE db 3, 3, LEECH_SEED db 3, 4, CONFUSION db 4, 1, THUNDER_WAVE @@ -325,8 +337,9 @@ SpecialTrainerMoves: db 1, 4, MIMIC db 2, 3, BUBBLEBEAM db 2, 4, BIDE + db 3, 1, BITE db 4, 1, THUNDER_WAVE - db 5, 1, CUT + db 5, 3, CUT db 0 db RIVAL2, 8 ; Pokemon Tower Rival w/Charmeleon @@ -336,7 +349,7 @@ SpecialTrainerMoves: db 3, 3, BUBBLEBEAM db 3, 4, BIDE db 4, 1, THUNDER_WAVE - db 5, 4, CUT + db 5, 3, CUT db 0 db RIVAL2, 9 ; Pokemon Tower Rival w/Eevee @@ -386,7 +399,7 @@ SpecialTrainerMoves: db ERIKA, 3 ; Erika 2 badges db 1, 2, GROWTH db 1, 4, VINE_WHIP - db 1, 1, CUT + db 2, 1, CUT db 4, 2, CUT db 5, 3, MEGA_DRAIN db 0 @@ -430,8 +443,8 @@ SpecialTrainerMoves: db ERIKA, 7 ; Erika 6 badges db 1, 3, ACID db 2, 2, MEGA_DRAIN - db 3, 1, EARTHQUAKE - db 3, 3, VINE_WHIP + db 3, 2, EARTHQUAKE + db 3, 4, VINE_WHIP db 4, 2, MEGA_DRAIN db 4, 4, ACID db 5, 1, BIND @@ -455,7 +468,7 @@ SpecialTrainerMoves: db KOGA, 3 ; Koga 2 badges db 2, 4, WATER_GUN db 3, 2, POUND - db 4, 1, TOXIC + db 4, 2, TOXIC db 5, 2, TOXIC db 5, 3, SCREECH db 0 @@ -467,7 +480,7 @@ SpecialTrainerMoves: db 2, 4, ACID db 3, 1, BODY_SLAM db 3, 2, DISABLE - db 4, 4, TOXIC + db 4, 1, TOXIC db 5, 1, WING_ATTACK db 5, 2, TOXIC db 5, 4, SCREECH @@ -492,27 +505,27 @@ SpecialTrainerMoves: db 1, 3, MEGA_DRAIN db 2, 1, TOXIC db 2, 2, SURF - db 2, 4, WRAP + db 2, 3, WRAP db 3, 3, BODY_SLAM db 3, 4, TOXIC - db 4, 1, TOXIC + db 4, 4, TOXIC db 5, 1, TOXIC db 5, 2, FLY db 0 - db BLACKBELT, 2 ; Koichi 1 badge + db KOICHI, 2 ; Koichi 1 badge db 2, 3, TACKLE db 3, 4, TACKLE db 4, 3, TACKLE db 0 - db BLACKBELT, 3 ; Koichi 2 badges + db KOICHI, 3 ; Koichi 2 badges db 3, 3, TACKLE db 4, 4, TACKLE db 5, 3, TACKLE db 0 - db BLACKBELT, 4 ; Koichi 3 badges + db KOICHI, 4 ; Koichi 3 badges db 2, 3, LEER db 2, 4, UPPERCUT db 3, 3, MEGA_KICK @@ -522,7 +535,7 @@ SpecialTrainerMoves: db 5, 4, DIG db 0 - db BLACKBELT, 5 ; Koichi 4 badges + db KOICHI, 5 ; Koichi 4 badges db 1, 4, ROCK_SLIDE db 2, 2, LEER db 2, 3, DIG @@ -532,7 +545,7 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 6 ; Koichi 5 badges + db KOICHI, 6 ; Koichi 5 badges db 1, 4, ROCK_SLIDE db 2, 1, LOW_KICK db 2, 2, LEER @@ -542,7 +555,7 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 7 ; Koichi 6 badges + db KOICHI, 7 ; Koichi 6 badges db 1, 3, ROCK_SLIDE db 1, 4, EARTHQUAKE db 2, 1, LOW_KICK @@ -554,15 +567,15 @@ SpecialTrainerMoves: db 5, 2, DIG db 0 - db BLACKBELT, 8 ; Koichi 7 badges + db KOICHI, 8 ; Koichi 7 badges db 1, 1, ROCK_SLIDE db 1, 2, LOW_KICK db 1, 3, EARTHQUAKE - db 2, 1, PIN_MISSILE - db 2, 2, UPPERCUT + db 2, 3, PIN_MISSILE + db 2, 4, UPPERCUT db 3, 1, LOW_KICK db 3, 2, ROCK_SLIDE - db 3, 3, DIG + db 3, 4, DIG db 4, 1, MIMIC db 4, 2, MEGA_KICK db 4, 3, MEDITATE @@ -571,12 +584,12 @@ SpecialTrainerMoves: db 6, 1, DIG db 0 - db BLACKBELT, 9 ; Koichi 8 badges + db KOICHI, 9 ; Koichi 8 badges db 1, 1, ROCK_SLIDE db 1, 2, EARTHQUAKE db 1, 3, SUBMISSION - db 2, 1, PIN_MISSILE - db 2, 2, UPPERCUT + db 2, 2, PIN_MISSILE + db 2, 3, MEGA_PUNCH db 3, 1, LOW_KICK db 3, 3, ROCK_SLIDE db 3, 4, DIG @@ -593,7 +606,6 @@ SpecialTrainerMoves: db 4, 2, BARRAGE db 4, 4, CONFUSION db 5, 2, THUNDER_WAVE - db 6, 1, BODY_SLAM db 6, 2, MEGA_DRAIN db 6, 3, SURF db 0 @@ -604,8 +616,7 @@ SpecialTrainerMoves: db 3, 1, SURF db 4, 1, DIG db 5, 2, THUNDER_WAVE - db 6, 2, BODY_SLAM - db 6, 3, GROWTH + db 6, 3, LEECH_SEED db 0 db RIVAL2, 13 ; Silph Co. Rival w/Charizard @@ -615,9 +626,8 @@ SpecialTrainerMoves: db 3, 4, CONFUSION db 4, 1, SURF db 5, 2, THUNDER_WAVE - db 6, 1, FLY - db 6, 2, BODY_SLAM - db 6, 3, FLAMETHROWER + db 6, 3, SEISMIC_TOSS + db 6, 4, FLY db 0 db RIVAL2, 14 ; Silph Co. Rival w/Umbreon @@ -635,7 +645,7 @@ SpecialTrainerMoves: db RIVAL2, 15 ; Silph Co. Rival w/Raichu db 1, 3, DIG db 1, 4, SWORDS_DANCE - db 2, 1, BARRAGE + db 2, 2, BARRAGE db 2, 4, CONFUSION db 3, 1, CONFUSE_RAY db 3, 4, FLAMETHROWER @@ -666,14 +676,14 @@ SpecialTrainerMoves: db 0 db SABRINA, 2 ; Sabrina 1 badge - db 1, 3, WATER_GUN + db 1, 4, WATER_GUN db 3, 1, PSYWAVE db 4, 3, PSYWAVE db 4, 4, REFLECT db 0 db SABRINA, 3 ; Sabrina 2 badges - db 1, 4, WATER_GUN + db 1, 2, WATER_GUN db 3, 3, LEECH_SEED db 3, 4, CONFUSION db 4, 1, PSYWAVE @@ -682,6 +692,7 @@ SpecialTrainerMoves: db 0 db SABRINA, 4 ; Sabrina 3 badges + db 1, 1, CONFUSION db 1, 4, WATER_GUN db 2, 3, PSYWAVE db 2, 4, REFLECT @@ -725,7 +736,7 @@ SpecialTrainerMoves: db BLAINE, 3 ; Blaine 2 badges db 2, 3, EMBER - db 3, 4, DIG + db 3, 2, DIG db 4, 1, CUT db 5, 2, LEER db 5, 3, SMOG @@ -735,9 +746,9 @@ SpecialTrainerMoves: db BLAINE, 4 ; Blaine 3 badges db 1, 1, EMBER db 2, 2, EMBER + db 3, 1, BITE db 3, 2, DIG - db 4, 1, CUT - db 4, 4, GROWL + db 4, 2, EMBER db 5, 2, LEER db 5, 3, SMOG db 5, 4, FIRE_PUNCH @@ -794,8 +805,10 @@ SpecialTrainerMoves: db 3, 3, SKULL_BASH db 3, 4, BONEMERANG db 4, 1, ROCK_SLIDE + db 4, 2, BODY_SLAM db 4, 3, DOUBLE_KICK db 5, 1, THUNDERBOLT + db 5, 2, THRASH db 5, 3, DOUBLE_KICK db 6, 1, FISSURE db 6, 3, STOMP @@ -828,9 +841,9 @@ SpecialTrainerMoves: db 4, 1, FIRE_BLAST db 4, 2, DIG db 4, 3, AGILITY + db 4, 4, DOUBLE_EDGE db 5, 1, THUNDER_WAVE - db 6, 1, BODY_SLAM - db 6, 2, LEECH_SEED + db 6, 3, LEECH_SEED db 0 db RIVAL2, 18 ; Route 22 Rival w/Charizard @@ -844,7 +857,7 @@ SpecialTrainerMoves: db 4, 3, SURF db 5, 1, THUNDER_WAVE db 6, 1, FLY - db 6, 2, BODY_SLAM + db 6, 3, FIRE_SPIN db 0 db RIVAL2, 19 ; Route 22 Rival w/Umbreon @@ -854,7 +867,7 @@ SpecialTrainerMoves: db 2, 2, HYPNOSIS db 2, 3, PSYCHIC_M db 3, 1, THUNDERBOLT - db 3, 2, DOUBLE_TEAM + db 3, 4, DOUBLE_TEAM db 4, 1, CONFUSE_RAY db 4, 2, REFLECT db 4, 4, FIRE_BLAST @@ -902,7 +915,7 @@ SpecialTrainerMoves: db BRUNO, 1 db 1, 3, MEDITATE db 2, 1, EARTHQUAKE - db 2, 2, ROCK_SLIDE + db 2, 3, ROCK_SLIDE db 2, 4, EXPLOSION db 3, 1, THUNDERBOLT db 4, 1, SUBMISSION @@ -914,15 +927,14 @@ SpecialTrainerMoves: db 0 db AGATHA, 1 - db 1, 1, LOW_KICK + db 1, 1, MEGA_PUNCH db 1, 2, ROCK_SLIDE - db 1, 3, MEGA_PUNCH db 2, 1, MEGA_DRAIN db 2, 3, CONFUSE_RAY db 2, 4, FLY db 3, 1, THUNDERBOLT db 3, 2, EXPLOSION - db 4, 1, WRAP + db 4, 3, WRAP db 4, 4, EARTHQUAKE db 5, 1, REST db 5, 3, TOXIC @@ -962,8 +974,9 @@ SpecialTrainerMoves: db 5, 1, PSYCHIC_M db 5, 2, SLEEP_POWDER db 5, 4, SOLARBEAM - db 6, 2, BLIZZARD + db 6, 1, BLIZZARD db 6, 3, BODY_SLAM + db 6, 4, PETAL_DANCE db 0 db RIVAL3, 2 ; Champion Rival w/Venusaur @@ -980,6 +993,7 @@ SpecialTrainerMoves: db 5, 4, DOUBLE_EDGE db 6, 1, SOLARBEAM db 6, 3, BODY_SLAM + db 6, 4, SLEEP_POWDER db 0 db RIVAL3, 3 ; Champion Rival w/Charizard