From e7ee37a1d965c51407ca6b1d482a39791989643c Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 21 Jul 2024 09:53:04 +0100 Subject: [PATCH] New teams for E4, Kanto Gym Leaders, etc --- data/trainers/parties.asm | 509 +++++++++++++------------- data/trainers/parties_new_classes.asm | 169 +++++++++ 2 files changed, 420 insertions(+), 258 deletions(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 40a4fd6..d69bf44 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -381,25 +381,70 @@ Rival1Group: end_list_items PokemonProfGroup: + next_list_item ; OAK (1) + db "OAK@", TRAINERTYPE_MOVES + db 60 + dw KANGASKHAN + dw ATTRACT, DIZZY_PUNCH, EARTHQUAKE, SURF + db 60 + dw VENUSAUR + dw SLEEP_POWDER, RAZOR_LEAF, SLUDGE_BOMB, SWORDS_DANCE + db 60 + dw CHARIZARD + dw BELLY_DRUM, FIRE_BLAST, EARTHQUAKE, BODY_SLAM + db 60 + dw TOTARTLE + dw GIGA_DRAIN, HYDRO_PUMP, BODY_SLAM, ICE_BEAM + db 60 + dw NIDOKING + dw EARTHQUAKE, ICE_BEAM, THUNDERBOLT, LOVELY_KISS + db 60 + dw TAUROS + dw BODY_SLAM, HYPER_BEAM, EARTHQUAKE, BLIZZARD ; Iconic King of Gen 1 set to represent Oak's aging. + db -1 ; end + + end_list_items WillGroup: next_list_item ; WILL (1) db "WILL@", TRAINERTYPE_MOVES db 40 dw XATU - dw QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M db 41 dw JYNX - dw DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M db 41 dw ESPEON dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M db 41 dw SLOWKING - dw CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M + dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M db 42 - dw XATU ; FARIGIRAF - dw QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + dw FARIGIRAF + dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work + db -1 ; end + + next_list_item ; WILL (1) + db "WILL@", TRAINERTYPE_MOVES + db 65 + dw XATU + dw NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + db 65 + dw JYNX + dw MEAN_LOOK, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + db 65 + dw ESPEON + dw REFLECT, QUICK_ATTACK, MORNING_SUN, PSYCHIC_M + db 65 + dw SLOWKING + dw CURSE, SURF, EARTHQUAKE, PSYCHIC_M + db 65 + dw WYRDEER + dw SWAGGER, STOMP, PSYCH_UP, PSYCHIC_M ; Check how Return/Frustration work + db 65 + dw FARIGIRAF + dw PSYCHIC_M, CRUNCH, STOMP, AGILITY ; Check how Return/Frustration work db -1 ; end end_list_items @@ -441,8 +486,8 @@ BrunoGroup: next_list_item ; BRUNO (1) db "BRUNO@", TRAINERTYPE_MOVES db 42 - dw HITMONTOP - dw PURSUIT, QUICK_ATTACK, DIG, DETECT + dw JABETTA + dw JUMP_KICK, HYDRO_PUMP, MEDITATE, DRILL_PECK db 42 dw HITMONLEE dw SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT @@ -456,7 +501,29 @@ BrunoGroup: dw MACHAMP dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db -1 ; end - + + next_list_item ; BRUNO (1) + db "BRUNO@", TRAINERTYPE_MOVES + db 65 + dw JABETTA + dw JUMP_KICK, HYDRO_PUMP, MEDITATE, DRILL_PECK + db 65 + dw HITMONLEE + dw SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT + db 65 + dw HITMONCHAN + dw MEGA_PUNCH, ICE_PUNCH, COUNTER, MACH_PUNCH + db 65 + dw HERACROSS + dw MEGAHORN, ENDURE, REVERSAL, FLAIL + db 65 + dw STEELIX + dw IRON_TAIL, EARTHQUAKE, EXPLOSION, ROCK_HEAD + db 65 + dw MACHAMP + dw ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP + db -1 ; end + end_list_items KarenGroup: @@ -468,11 +535,8 @@ KarenGroup: db 42 dw BELLEDAM dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT - db 45 - dw WARUCHU - dw PURSUIT, THUNDERBOLT, THUNDER_WAVE, CRUNCH db 44 - dw MURKROW ; HONCHKROW + dw HONCHKROW dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK db 47 dw HOUNDOOM @@ -481,6 +545,28 @@ KarenGroup: dw TYRANITAR dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH db -1 ; end + + next_list_item ; KAREN (1) + db "KAREN@", TRAINERTYPE_MOVES + db 65 + dw UMBREON + dw SAND_ATTACK, CONFUSE_RAY, PURSUIT, MEAN_LOOK + db 65 + dw BELLEDAM + dw PURSUIT, HEAL_BELL, LOVELY_KISS, ATTRACT + db 65 + dw WARUCHU + dw PURSUIT, THUNDERBOLT, THUNDER_WAVE, CRUNCH + db 65 + dw HONCHKROW + dw QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK + db 65 + dw HOUNDOOM + dw ROAR, PURSUIT, FLAMETHROWER, CRUNCH + db 65 + dw TYRANITAR + dw PURSUIT, ROCK_SLIDE, ICE_BEAM, DYNAMICPUNCH + db -1 ; end end_list_items @@ -488,14 +574,14 @@ KogaGroup: next_list_item ; KOGA (1) db "KOGA@", TRAINERTYPE_MOVES db 43 - dw FORRETRESS - dw PROTECT, SWIFT, EXPLOSION, SPIKES + dw QWILFATHER + dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE db 40 dw ARIADOS - dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN + dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY db 41 dw VENOMOTH - dw SUPERSONIC, GUST, PSYCHIC_M, TOXIC + dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC db 42 dw MUK dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC @@ -503,6 +589,28 @@ KogaGroup: dw CROBAT dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db -1 ; end + + next_list_item ; KOGA (1) + db "KOGA@", TRAINERTYPE_MOVES + db 65 + dw QWILFATHER + dw SPIKES, HYDRO_PUMP, MINIMIZE, HAZE + db 65 + dw ARIADOS + dw DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, AGILITY + db 65 + dw LICKILORD + dw SWAGGER, PSYCH_UP, BODY_SLAM, EARTHQUAKE + db 65 + dw VENOMOTH + dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, TOXIC + db 65 + dw MUK + dw MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC + db 65 + dw CROBAT + dw DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC + db -1 ; end end_list_items @@ -511,44 +619,69 @@ ChampionGroup: db "LANCE@", TRAINERTYPE_MOVES db 44 dw GYARADOS - dw FLAIL, RAIN_DANCE, SURF, HYPER_BEAM + dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM db 47 - dw DRAGONITE - dw THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM + dw CHARIZARD + dw ROCK_SLIDE, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM db 47 - dw DRAGONITE - dw THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM + dw GAVILLAIN + dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM db 46 dw AERODACTYL - dw WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM + dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM ; Now legal! db 46 - dw CHARIZARD - dw FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM + dw IGUANARCH + dw DRAGONBREATH, GLARE, THUBDERBOLT, HYPER_BEAM db 50 dw DRAGONITE dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db -1 ; end + + next_list_item ; CHAMPION (1) + db "LANCE@", TRAINERTYPE_MOVES + db 70 + dw GYARADOS + dw THUNDERBOLT, RAIN_DANCE, SURF, HYPER_BEAM + db 70 + dw CHARIZARD + dw BELLY_DRUM, FLAMETHROWER, EARTHQUAKE, HYPER_BEAM + db 70 + dw GAVILLAIN + dw THUNDERBOLT, DRAGONBREATH, GLARE, HYPER_BEAM + db 70 + dw AERODACTYL + dw WING_ATTACK, ANCIENTPOWER, EARTHQUAKE, HYPER_BEAM + db 70 + dw IGUANARCH + dw DRAGONBREATH, GLARE, THUBDERBOLT, HYPER_BEAM + db 70 + dw DRAGONITE + dw FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM + db -1 ; end end_list_items BrockGroup: next_list_item ; BROCK (1) db "BROCK@", TRAINERTYPE_MOVES - db 41 - dw GRAVELER + db 60 + dw GOLEM dw DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE - db 41 - dw RHYHORN - dw FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL - db 42 + db 60 + dw SUDOWOODO + dw MIMIC, ROCK_SLIDE, EARTHQUAKE, SELFDESTRUCT + db 60 dw OMASTAR - dw BITE, SURF, PROTECT, SPIKE_CANNON - db 44 - dw ONIX - dw BIND, ROCK_SLIDE, BIDE, SANDSTORM - db 42 + dw BITE, SURF, PROTECT, ICE_BEAM + db 60 dw KABUTOPS - dw SLASH, SURF, ENDURE, GIGA_DRAIN + dw SWORDS_DANCE, ANCIENTPOWER, SURF, GIGA_DRAIN + db 60 + dw AERODACTYL + dw EARTHQUAKE, ANCIENTPOWER, WING_ATTACK, STEEL_WING + db 60 + dw STEELIX + dw IRON_TAIL, EARTHQUAKE, SANDSTORM, FISSURE ; No Explosion, it's his last Pokemon! db -1 ; end end_list_items @@ -556,16 +689,22 @@ BrockGroup: MistyGroup: next_list_item ; MISTY (1) db "MISTY@", TRAINERTYPE_MOVES - db 42 - dw GOLDUCK - dw SURF, DISABLE, PSYCH_UP, PSYCHIC_M - db 42 + db 60 + dw POLITOED + dw SURF, HYPNOSIS, PERISH_SONG, WHIRLPOOL + db 60 dw QUAGSIRE - dw SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE - db 44 - dw LAPRAS - dw SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE - db 47 + dw BELLY_DRUM, BODY_SLAM, EARTHQUAKE, ANCIENTPOWER + db 60 + dw GRENMAR + dw HYDRO_PUMP, FIRE_BLAST, ENCORE, HEADBUTT + db 60 + dw LANTURN + dw SURF, CONFUSE_RAY, THUNDERBOLT, ICE_BEAM + db 60 + dw GOLDUCK + dw SURF, PSYCHIC_M, BODY_SLAM, ICE_BEAM + db 60 dw STARMIE dw SURF, CONFUSE_RAY, RECOVER, ICE_BEAM db -1 ; end @@ -575,21 +714,24 @@ MistyGroup: LtSurgeGroup: next_list_item ; LT_SURGE (1) db "LT.SURGE@", TRAINERTYPE_MOVES - db 44 - dw RAICHU - dw THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER - db 40 + db 60 dw ELECTRODE - dw SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION - db 40 - dw MAGNETON - dw LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON - db 40 - dw ELECTRODE - dw SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION - db 46 - dw ELECTABUZZ - dw QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER + dw EXPLOSION, THUNDERBOLT, THUNDER_WAVE, MIRROR_COAT + db 60 + dw KAZEPPELIN + dw HYDRO_PUMP, PIN_MISSILE, THUNDERBOLT, MINIMIZE + db 60 + dw MAGNEZONE + dw THUNDERBOLT, THUNDER_WAVE, RAIN_DANCE, THUNDER + db 60 + dw GOROTORA + dw BODY_SLAM, EARTHQUAKE, THUNDERBOLT, THUNDER_WAVE + db 60 + dw ELECTIVIRE + dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT + db 60 + dw RAICHU ; GOROCHU + dw BELLY_DRUM, THUNDERBOLT, BODY_SLAM, SUBMISSION db -1 ; end end_list_items @@ -641,18 +783,24 @@ ScientistGroup: ErikaGroup: next_list_item ; ERIKA (1) db "ERIKA@", TRAINERTYPE_MOVES - db 42 - dw TANGELA - dw VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER - db 41 + db 60 dw JUMPLUFF - dw MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN - db 46 + dw LEECH_SEED, ENCORE, GIGA_DRAIN, REFLECT + db 60 + dw TOEDSCRUEL + dw SPORE, SWORDS_DANCE, EARTHQUAKE, DOUBLE_EDGE + db 60 + dw SAKURAZE + dw SUNNY_DAY, SOLARBEAM, FIRE_BLAST, SYNTHESIS + db 60 dw VICTREEBEL - dw SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF - db 46 - dw BELLOSSOM - dw SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM + dw SOLARBEAM, SLUDGE_BOMB, SWORDS_DANCE, SLEEP_POWDER + db 60 + dw ELECTIVIRE ; TANGROWTH + dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT ; SLEEP_POWDER, SWORDS_DANCE, EARTHQUAKE, GIGA_DRAIN + db 60 + dw BELLOSSOM ; GOROCHU + dw SLEEP_POWDER, SOLARBEAM, SUNNY_DAY, GIGA_DRAIN db -1 ; end end_list_items @@ -1159,193 +1307,27 @@ BirdKeeperGroup: end_list_items -LassGroup: - next_list_item ; LASS (1) - db "CARRIE@", TRAINERTYPE_NORMAL - db 18 - dw SNUBBULL - db -1 ; end - - next_list_item ; LASS (2) - db "BRIDGET@", TRAINERTYPE_NORMAL - db 15 - dw JIGGLYPUFF - db 15 - dw JIGGLYPUFF - db 15 - dw JIGGLYPUFF - db -1 ; end - - next_list_item ; LASS (3) - db "ALICE@", TRAINERTYPE_NORMAL - db 30 - dw GLOOM - db 34 - dw ARBOK - db 30 - dw GLOOM - db -1 ; end - - next_list_item ; LASS (4) - db "KRISE@", TRAINERTYPE_NORMAL - db 12 - dw ODDISH - db 15 - dw CUBONE - db -1 ; end - - next_list_item ; LASS (5) - db "CONNIE@", TRAINERTYPE_NORMAL - db 21 - dw MARILL - db -1 ; end - - next_list_item ; LASS (6) - db "LINDA@", TRAINERTYPE_NORMAL - db 30 - dw BULBASAUR - db 32 - dw IVYSAUR - db 34 - dw VENUSAUR - db -1 ; end - - next_list_item ; LASS (7) - db "LAURA@", TRAINERTYPE_NORMAL - db 28 - dw GLOOM - db 31 - dw PIDGEOTTO - db 31 - dw BELLOSSOM - db -1 ; end - - next_list_item ; LASS (8) - db "SHANNON@", TRAINERTYPE_NORMAL - db 29 - dw PARAS - db 29 - dw PARAS - db 32 - dw PARASECT - db -1 ; end - - next_list_item ; LASS (9) - db "MICHELLE@", TRAINERTYPE_NORMAL - db 32 - dw SKIPLOOM - db 33 - dw HOPPIP - db 34 - dw JUMPLUFF - db -1 ; end - - next_list_item ; LASS (10) - db "DANA@", TRAINERTYPE_MOVES - db 18 - dw FLAAFFY - dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 18 - dw PSYDUCK - dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION - db -1 ; end - - next_list_item ; LASS (11) - db "ELLEN@", TRAINERTYPE_NORMAL - db 30 - dw WIGGLYTUFF - db 34 - dw GRANBULL - db -1 ; end - - next_list_item ; LASS (12) - db "CONNIE@", TRAINERTYPE_NORMAL - db 21 - dw MARILL - db -1 ; end - - next_list_item ; LASS (13) - db "CONNIE@", TRAINERTYPE_NORMAL - db 21 - dw MARILL - db -1 ; end - - next_list_item ; LASS (14) - db "DANA@", TRAINERTYPE_MOVES - db 21 - dw FLAAFFY - dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 21 - dw PSYDUCK - dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION - db -1 ; end - - next_list_item ; LASS (15) - db "DANA@", TRAINERTYPE_MOVES - db 29 - dw PSYDUCK - dw SCRATCH, DISABLE, CONFUSION, SCREECH - db 29 - dw AMPHAROS - dw TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE - db -1 ; end - - next_list_item ; LASS (16) - db "DANA@", TRAINERTYPE_MOVES - db 32 - dw PSYDUCK - dw SCRATCH, DISABLE, CONFUSION, SCREECH - db 32 - dw AMPHAROS - dw TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE - db -1 ; end - - next_list_item ; LASS (17) - db "DANA@", TRAINERTYPE_MOVES - db 36 - dw AMPHAROS - dw SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE - db 36 - dw GOLDUCK - dw DISABLE, SURF, PSYCHIC_M, SCREECH - db -1 ; end - - next_list_item ; LASS (2) - db "IKUE@", TRAINERTYPE_ITEM_MOVES - db 43 - dw NIDOQUEEN ; From the Yellow Lass - db NO_ITEM - db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT - db 43 - dw GOROTORA ; Basically the beta Pikaclone counterpart, right? - db NO_ITEM - db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT - db 45 - dw PIKACHU ; And a pipe bomb. - db LIGHT_BALL - db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime - db -1 ; end - - end_list_items - JanineGroup: next_list_item ; JANINE (1) db "JANINE@", TRAINERTYPE_MOVES - db 36 - dw CROBAT - dw SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK - db 36 - dw WEEZING - dw SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION - db 36 - dw WEEZING - dw SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION - db 33 + db 60 dw ARIADOS - dw SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE - db 39 + dw SPIDER_WEB, AGILITY, BATON_PASS, DOUBLE_TEAM + db 60 dw VENOMOTH - dw FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M + dw SLEEP_POWDER, PSYCHIC_M, GIGA_DRAIN, STUN_SPORE + db 60 + dw NIDOQUEEN + dw EARTHQUAKE, THUNDERBOLT, ICE_BEAM, BODY_SLAM + db 60 + dw GENGAR + dw HYPNOSIS, THUNDERBOLT, PERISH_SONG, PSYCHIC_M + db 60 + dw ELECTIVIRE ; CLODSIRE + dw THUNDERBOLT, ROLLING_KICK, BODY_SLAM, PURSUIT ; BELLY_DRUM, EARTHQUAKE, SPIKES, BODY_SLAM + db 60 + dw BELLIGNAN ; GOROCHU + dw SLEEP_POWDER, SWORDS_DANCE, SLUDGE_BOMB, GIGA_DRAIN db -1 ; end end_list_items @@ -2339,15 +2321,26 @@ TeacherGroup: SabrinaGroup: next_list_item ; SABRINA (1) db "SABRINA@", TRAINERTYPE_MOVES - db 46 + db 60 + dw ARIADOS ; MR_RIME + dw SPIDER_WEB, AGILITY, BATON_PASS, DOUBLE_TEAM ; REFLECT, LIGHT_SCREEN, PSYCHIC_M, ICE_BEAM + db 60 + dw HYPNO + dw SWAGGER, PSYCH_UP, HEADBUTT, THUNDER_WAVE ; god this is hilarious + db 60 + dw JYNX + dw LOVELY_KISS, PSYCHIC_M, ICE_BEAM, MEAN_LOOK + db 60 + dw EXEGGUTOR + dw SLEEP_POWDER, GIGA_DRAIN, EXPLOSION, PSYCHIC_M + db 60 dw ESPEON - dw SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M - db 46 - dw MR__MIME - dw BARRIER, REFLECT, BATON_PASS, PSYCHIC_M - db 48 + dw PSYCHIC_M, MORNING_SUN, BITE, QUICK_ATTACK ; SYNCHRONIZE, keep Bite for Dark attacking options + db 60 dw ALAKAZAM - dw RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + dw PSYCHIC_M, RECOVER, FIRE_PUNCH, THUNDERPUNCH + db -1 ; end + db -1 ; end end_list_items diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm index d1b2751..24ad71f 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -109,3 +109,172 @@ KabufossilGroup: dw KABUTOPS db -1 ; end end_list_items + +LassGroup: + next_list_item ; LASS (1) + db "CARRIE@", TRAINERTYPE_NORMAL + db 18 + dw SNUBBULL + db -1 ; end + + next_list_item ; LASS (2) + db "BRIDGET@", TRAINERTYPE_NORMAL + db 15 + dw JIGGLYPUFF + db 15 + dw JIGGLYPUFF + db 15 + dw JIGGLYPUFF + db -1 ; end + + next_list_item ; LASS (3) + db "ALICE@", TRAINERTYPE_NORMAL + db 30 + dw GLOOM + db 34 + dw ARBOK + db 30 + dw GLOOM + db -1 ; end + + next_list_item ; LASS (4) + db "KRISE@", TRAINERTYPE_NORMAL + db 12 + dw ODDISH + db 15 + dw CUBONE + db -1 ; end + + next_list_item ; LASS (5) + db "CONNIE@", TRAINERTYPE_NORMAL + db 21 + dw MARILL + db -1 ; end + + next_list_item ; LASS (6) + db "LINDA@", TRAINERTYPE_NORMAL + db 30 + dw BULBASAUR + db 32 + dw IVYSAUR + db 34 + dw VENUSAUR + db -1 ; end + + next_list_item ; LASS (7) + db "LAURA@", TRAINERTYPE_NORMAL + db 28 + dw GLOOM + db 31 + dw PIDGEOTTO + db 31 + dw BELLOSSOM + db -1 ; end + + next_list_item ; LASS (8) + db "SHANNON@", TRAINERTYPE_NORMAL + db 29 + dw PARAS + db 29 + dw PARAS + db 32 + dw PARASECT + db -1 ; end + + next_list_item ; LASS (9) + db "MICHELLE@", TRAINERTYPE_NORMAL + db 32 + dw SKIPLOOM + db 33 + dw HOPPIP + db 34 + dw JUMPLUFF + db -1 ; end + + next_list_item ; LASS (10) + db "DANA@", TRAINERTYPE_MOVES + db 18 + dw FLAAFFY + dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 18 + dw PSYDUCK + dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db -1 ; end + + next_list_item ; LASS (11) + db "ELLEN@", TRAINERTYPE_NORMAL + db 30 + dw WIGGLYTUFF + db 34 + dw GRANBULL + db -1 ; end + + next_list_item ; LASS (12) + db "CONNIE@", TRAINERTYPE_NORMAL + db 21 + dw MARILL + db -1 ; end + + next_list_item ; LASS (13) + db "CONNIE@", TRAINERTYPE_NORMAL + db 21 + dw MARILL + db -1 ; end + + next_list_item ; LASS (14) + db "DANA@", TRAINERTYPE_MOVES + db 21 + dw FLAAFFY + dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 21 + dw PSYDUCK + dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db -1 ; end + + next_list_item ; LASS (15) + db "DANA@", TRAINERTYPE_MOVES + db 29 + dw PSYDUCK + dw SCRATCH, DISABLE, CONFUSION, SCREECH + db 29 + dw AMPHAROS + dw TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE + db -1 ; end + + next_list_item ; LASS (16) + db "DANA@", TRAINERTYPE_MOVES + db 32 + dw PSYDUCK + dw SCRATCH, DISABLE, CONFUSION, SCREECH + db 32 + dw AMPHAROS + dw TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE + db -1 ; end + + next_list_item ; LASS (17) + db "DANA@", TRAINERTYPE_MOVES + db 36 + dw AMPHAROS + dw SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE + db 36 + dw GOLDUCK + dw DISABLE, SURF, PSYCHIC_M, SCREECH + db -1 ; end + + next_list_item ; LASS (2) + db "IKUE@", TRAINERTYPE_ITEM_MOVES + db 43 + dw NIDOQUEEN ; From the Yellow Lass + db NO_ITEM + db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT + db 43 + dw GOROTORA ; Basically the beta Pikaclone counterpart, right? + db NO_ITEM + db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT + db 45 + dw PIKACHU ; And a pipe bomb. + db LIGHT_BALL + db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime + db -1 ; end + + end_list_items