From dbc9fe29293ab73ef12517878be34b093639e6b1 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 27 Dec 2023 23:31:30 +0000 Subject: [PATCH] Postgame boss movesets: Batch 1 Includes Professor Oak's 5 teams, Chief's team, as well as the postgame teams for Yujirou, Koichi, Brock, Misty, Lt. Surge, Erika, Koga, Sabrina and Blaine. --- data/trainers/rival_parties.asm | 4 +- data/trainers/scaled_parties.asm | 4 +- data/trainers/special_moves.asm | 314 +++++++++++++++++++++++++++++++ 3 files changed, 318 insertions(+), 4 deletions(-) diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 60de4e4a..67521f0f 100644 --- a/data/trainers/rival_parties.asm +++ b/data/trainers/rival_parties.asm @@ -60,8 +60,8 @@ ProfOakData: db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0 db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0 db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0 - db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0 - db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0 ; with Oak's teams, he uses his original unused team with Nidoking added on. ; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen. ; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap. diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 38237f16..0d91512c 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -64,8 +64,8 @@ SabrinaData: db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4 db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5 db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6 - db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) - db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) + db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) + db $FF, 62, JYNX, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) BlaineData: db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused) diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index e163785e..68bebd9f 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1048,5 +1048,319 @@ SpecialTrainerMoves: db 6, 3, THUNDER_WAVE db 6, 4, SURF db 0 + + db PROF_OAK, 1 ; Totartle Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 3, 1, FIRE_BLAST + db 3, 2, DIG + db 3, 3, AGILITY + db 3, 4, BODY_SLAM + db 4, 1, PSYCHIC_M + db 4, 2, SLEEP_POWDER + db 4, 3, EXPLOSION + db 4, 4, MEGA_DRAIN + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db PROF_OAK, 2 ; Venusaur Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, PSYCHIC_M + db 2, 2, SLEEP_POWDER + db 2, 3, EXPLOSION + db 2, 4, MEGA_DRAIN + db 3, 1, BLIZZARD + db 3, 2, THUNDERBOLT + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 4, 4, BODY_SLAM + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, SWORDS_DANCE + db 6, 2, RAZOR_LEAF + db 6, 3, HYPER_BEAM + db 6, 4, SLEEP_POWDER + db 0 + + db PROF_OAK, 3 ; Charizard Team + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, FIRE_BLAST + db 2, 2, DIG + db 2, 3, AGILITY + db 2, 4, BODY_SLAM + db 3, 1, PSYCHIC_M + db 3, 2, SLEEP_POWDER + db 3, 3, EXPLOSION + db 3, 4, MEGA_DRAIN + db 4, 1, BLIZZARD + db 4, 2, THUNDERBOLT + db 5, 1, BLIZZARD + db 5, 3, THUNDERBOLT + db 5, 4, THRASH + db 6, 1, SWORDS_DANCE + db 6, 3, FIRE_BLAST + db 6, 4, EARTHQUAKE + db 0 + + db PROF_OAK, 4 ; Pika/Vee Team 1 + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BLIZZARD + db 3, 3, THUNDERBOLT + db 3, 4, THRASH + db 4, 1, SWORDS_DANCE + db 4, 2, RAZOR_LEAF + db 4, 3, HYPER_BEAM + db 4, 4, SLEEP_POWDER + db 5, 1, SWORDS_DANCE + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db PROF_OAK, 5 ; Pika/Vee Team 2 + db 1, 1, HYPER_BEAM + db 1, 3, EARTHQUAKE + db 1, 4, BLIZZARD + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BLIZZARD + db 3, 3, THUNDERBOLT + db 3, 4, THRASH + db 4, 1, SWORDS_DANCE + db 4, 2, RAZOR_LEAF + db 4, 3, HYPER_BEAM + db 4, 4, SLEEP_POWDER + db 5, 1, SWORDS_DANCE + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, BLIZZARD + db 6, 3, BODY_SLAM + db 6, 4, SOLARBEAM + db 0 + + db YUJIROU, 10 ; Yujirou postgame + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 1, 4, HYPNOSIS + db 2, 1, FIRE_BLAST + db 2, 3, HYPER_BEAM + db 2, 4, FISSURE + db 3, 1, REFLECT + db 3, 2, ICE_BEAM + db 3, 3, PSYCHIC_M + db 3, 4, SOFTBOILED + db 5, 2, LOVELY_KISS + db 5, 3, BLIZZARD + db 5, 4, AMNESIA + db 6, 1, WRAP + db 6, 2, SWORDS_DANCE + db 6, 3, HYPER_BEAM + db 6, 4, EARTHQUAKE + db 0 + + db KOICHI, 10 ; Koichi postgame + db 1, 1, ROCK_SLIDE + db 1, 2, EARTHQUAKE + db 1, 4, BODY_SLAM + db 2, 2, ROCK_SLIDE + db 2, 3, SEISMIC_TOSS + db 3, 1, EARTHQUAKE + db 3, 2, HYPER_BEAM + db 3, 3, BODY_SLAM + db 4, 1, COUNTER + db 4, 2, SEISMIC_TOSS + db 4, 4, BODY_SLAM + db 5, 2, AGILITY + db 5, 3, HI_JUMP_KICK + db 6, 3, HI_JUMP_KICK + db 6, 4, DIG + db 0 + + db BROCK, 9 ; Brock postgame + db 1, 3, EARTHQUAKE + db 1, 4, BODY_SLAM + db 2, 1, SURF + db 2, 2, SUBSTITUTE + db 2, 3, FIRE_BLAST + db 3, 3, FIRE_BLAST + db 3, 4, FIRE_SPIN + db 4, 1, BODY_SLAM + db 4, 2, REST + db 4, 3, SURF + db 4, 4, ICE_BEAM + db 5, 1, SURF + db 5, 2, SWORDS_DANCE + db 5, 3, HYPER_BEAM + db 5, 4, DIG + db 6, 1, ROCK_SLIDE + db 6, 3, BIND + db 6, 4, EARTHQUAKE + db 0 + db MISTY, 9 ; Misty postgame + db 1, 1, REST + db 1, 2, ICE_BEAM + db 2, 1, AMNESIA + db 2, 2, GLARE + db 2, 3, PSYCHIC_M + db 2, 4, SURF + db 3, 1, BODY_SLAM + db 3, 2, EARTHQUAKE + db 3, 3, SUBMISSION + db 4, 1, SURF + db 4, 2, GROWTH + db 4, 4, BLIZZARD + db 5, 1, COUNTER + db 5, 2, BLIZZARD + db 5, 3, MEGA_DRAIN + db 5, 4, SURF + db 6, 1, RECOVER + db 6, 2, SURF + db 6, 3, PSYCHIC_M + db 6, 4, THUNDERBOLT + db 0 + + db LT_SURGE, 9 ; Surge postgame + db 1, 1, THUNDER_WAVE + db 1, 2, EARTHQUAKE + db 1, 4, HYPER_BEAM + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 3, EARTHQUAKE + db 3, 4, THUNDER_WAVE + db 4, 1, THUNDERBOLT + db 4, 2, ROLLING_KICK + db 4, 3, ICE_PUNCH + db 4, 4, PSYCHIC_M + db 5, 3, THUNDERBOLT + db 5, 4, GROWTH + db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 3, FLY + db 6, 4, SURF + db 0 + + db ERIKA, 9 ; Erika postgame + db 1, 1, REST + db 1, 2, RAZOR_LEAF + db 1, 3, ACID + db 2, 1, SWORDS_DANCE + db 2, 2, EARTHQUAKE + db 2, 3, WRAP + db 3, 1, MEGA_DRAIN + db 3, 2, THUNDERBOLT + db 3, 3, THUNDER_WAVE + db 4, 1, HYPER_BEAM + db 4, 3, BODY_SLAM + db 4, 4, SWORDS_DANCE + db 5, 1, SOLARBEAM + db 5, 3, BODY_SLAM + db 5, 4, SLEEP_POWDER + db 6, 2, MEGA_DRAIN + db 6, 3, ROCK_SLIDE + db 6, 4, AMNESIA + db 0 + + db KOGA, 9 ; Koga postgame + db 1, 2, MEGA_DRAIN + db 2, 1, RAZOR_LEAF + db 2, 2, ACID + db 2, 4, WRAP + db 3, 1, SURF + db 4, 1, THUNDERBOLT + db 4, 2, ICE_PUNCH + db 4, 3, SLUDGE + db 4, 4, EXPLOSION + db 5, 1, THUNDERBOLT + db 5, 2, FIRE_BLAST + db 5, 3, SLUDGE + db 6, 1, MEGA_DRAIN + db 6, 3, CONFUSE_RAY + db 6, 4, FLY + db 0 + + db SABRINA, 9 ; Sabrina postgame + db 1, 1, LOVELY_KISS + db 1, 2, BODY_SLAM + db 1, 3, PSYCHIC_M + db 2, 1, EARTHQUAKE + db 2, 2, SURF + db 3, 1, HYPNOSIS + db 3, 3, DOUBLE_KICK + db 4, 1, THUNDERPUNCH + db 4, 2, ICE_PUNCH + db 4, 4, AMNESIA + db 5, 1, HYPER_BEAM + db 5, 2, REFLECT + db 5, 3, GROWTH + db 6, 1, FIRE_PUNCH + db 6, 4, THUNDERPUNCH + db 0 + + db BLAINE, 9 ; Blaine postgame + db 1, 1, HYPNOSIS + db 1, 2, FIRE_SPIN + db 1, 3, DOUBLE_KICK + db 1, 4, FIRE_BLAST + db 2, 1, FIRE_BLAST + db 2, 2, DIG + db 2, 3, AGILITY + db 2, 4, BODY_SLAM + db 3, 1, BODY_SLAM + db 3, 2, EARTHQUAKE + db 3, 3, SUBMISSION + db 3, 4, FIRE_BLAST + db 4, 1, GROWTH + db 4, 2, HYPER_BEAM + db 4, 3, FIRE_BLAST + db 5, 1, FLY + db 5, 3, FIRE_BLAST + db 5, 4, EARTHQUAKE + db 6, 1, FIRE_BLAST + db 6, 2, THUNDERBOLT + db 6, 3, EARTHQUAKE + db 6, 4, CONFUSE_RAY + db 0 + + db CHIEF, 1 + db 1, 1, THUNDERBOLT + db 1, 2, THUNDER_WAVE + db 1, 3, HEADBUTT + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 2, 3, SING + db 2, 4, HYPER_BEAM + db 3, 1, IRON_HEAD + db 3, 3, HYPER_BEAM + db 4, 1, EXPLOSION + db 4, 2, THUNDERBOLT + db 4, 4, ICE_PUNCH + db 5, 1, THUNDERBOLT + db 5, 2, ICE_BEAM + db 5, 3, RECOVER + db 6, 1, THUNDERBOLT + db 6, 2, THUNDER_WAVE + db 6, 4, ICE_BEAM + db 0 + db -1 ; end