From 9ac2cea1f7b76e81def9d98761315cdf7790275a Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 31 Jan 2018 00:46:03 -0500 Subject: [PATCH] Align columns --- data/trainers/parties.asm | 854 +++++++++++++++++++------------------- 1 file changed, 427 insertions(+), 427 deletions(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index e21a7407d..98558c75d 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -15,8 +15,8 @@ FalknerGroup: ; ================================ ; FALKNER (1) db "FALKNER@", TRAINERTYPE_MOVES - db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE - db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE + db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE + db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE db -1 ; end ; ================================ @@ -25,8 +25,8 @@ WhitneyGroup: ; ================================ ; WHITNEY (1) db "WHITNEY@", TRAINERTYPE_MOVES - db 18, CLEFAIRY, DOUBLESLAP, MIMIC, ENCORE, METRONOME - db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK + db 18, CLEFAIRY, DOUBLESLAP, MIMIC, ENCORE, METRONOME + db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK db -1 ; end ; ================================ @@ -35,9 +35,9 @@ BugsyGroup: ; ================================ ; BUGSY (1) db "BUGSY@", TRAINERTYPE_MOVES - db 14, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE - db 14, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE - db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE + db 14, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE + db 14, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE + db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE db -1 ; end ; ================================ @@ -46,10 +46,10 @@ MortyGroup: ; ================================ ; MORTY (1) db "MORTY@", TRAINERTYPE_MOVES - db 21, GASTLY, LICK, SPITE, MEAN_LOOK, CURSE - db 21, HAUNTER, HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE - db 25, GENGAR, HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER - db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE + db 21, GASTLY, LICK, SPITE, MEAN_LOOK, CURSE + db 21, HAUNTER, HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE + db 25, GENGAR, HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER + db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE db -1 ; end ; ================================ @@ -58,9 +58,9 @@ PryceGroup: ; ================================ ; PRYCE (1) db "PRYCE@", TRAINERTYPE_MOVES - db 27, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST - db 29, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST - db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD + db 27, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 29, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db -1 ; end ; ================================ @@ -69,9 +69,9 @@ JasmineGroup: ; ================================ ; JASMINE (1) db "JASMINE@", TRAINERTYPE_MOVES - db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE - db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE - db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL + db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE + db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE + db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL db -1 ; end ; ================================ @@ -80,8 +80,8 @@ ChuckGroup: ; ================================ ; CHUCK (1) db "CHUCK@", TRAINERTYPE_MOVES - db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES - db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH + db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES + db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db -1 ; end ; ================================ @@ -90,10 +90,10 @@ ClairGroup: ; ================================ ; CLAIR (1) db "CLAIR@", TRAINERTYPE_MOVES - db 37, DRAGONAIR, THUNDER_WAVE, SURF, SLAM, DRAGONBREATH - db 37, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH - db 37, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH - db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH + db 37, DRAGONAIR, THUNDER_WAVE, SURF, SLAM, DRAGONBREATH + db 37, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH + db 37, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH + db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db -1 ; end ; ================================ @@ -102,17 +102,17 @@ Rival1Group: ; ================================ ; RIVAL1 (1) db "?@", TRAINERTYPE_NORMAL - db 5, CHIKORITA + db 5, CHIKORITA db -1 ; end ; RIVAL1 (2) db "?@", TRAINERTYPE_NORMAL - db 5, CYNDAQUIL + db 5, CYNDAQUIL db -1 ; end ; RIVAL1 (3) db "?@", TRAINERTYPE_NORMAL - db 5, TOTODILE + db 5, TOTODILE db -1 ; end ; RIVAL1 (4) @@ -138,82 +138,82 @@ Rival1Group: ; RIVAL1 (7) db "?@", TRAINERTYPE_MOVES - db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE - db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY - db 22, BAYLEEF, GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, BAYLEEF, GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER db -1 ; end ; RIVAL1 (8) db "?@", TRAINERTYPE_MOVES - db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE - db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY - db 22, QUILAVA, LEER, SMOKESCREEN, EMBER, QUICK_ATTACK + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, QUILAVA, LEER, SMOKESCREEN, EMBER, QUICK_ATTACK db -1 ; end ; RIVAL1 (9) db "?@", TRAINERTYPE_MOVES - db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE - db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY - db 22, CROCONAW, LEER, RAGE, WATER_GUN, BITE + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, CROCONAW, LEER, RAGE, WATER_GUN, BITE db -1 ; end ; RIVAL1 (10) db "?@", TRAINERTYPE_MOVES - db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE - db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL - db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK - db 32, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end ; RIVAL1 (11) db "?@", TRAINERTYPE_MOVES - db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE - db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL - db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK - db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end ; RIVAL1 (12) db "?@", TRAINERTYPE_MOVES - db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE - db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL - db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK db 32, FERALIGATR, RAGE, WATER_GUN, BITE, SCARY_FACE db -1 ; end ; RIVAL1 (13) db "?@", TRAINERTYPE_MOVES - db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT - db 38, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end ; RIVAL1 (14) db "?@", TRAINERTYPE_MOVES - db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT db 38, TYPHLOSION, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end ; RIVAL1 (15) db "?@", TRAINERTYPE_MOVES - db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 34, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 34, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end ; ================================ @@ -227,11 +227,11 @@ WillGroup: ; ================================ ; WILL (1) db "WILL@", TRAINERTYPE_MOVES - db 40, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M - db 41, JYNX, DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M - db 41, EXEGGUTOR, REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M - db 41, SLOWBRO, CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M - db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + db 40, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + db 41, JYNX, DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + db 41, EXEGGUTOR, REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M + db 41, SLOWBRO, CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M + db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M db -1 ; end ; ================================ @@ -265,11 +265,11 @@ BrunoGroup: ; ================================ ; BRUNO (1) db "BRUNO@", TRAINERTYPE_MOVES - db 42, HITMONTOP, PURSUIT, QUICK_ATTACK, DIG, DETECT - db 42, HITMONLEE, SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT + db 42, HITMONTOP, PURSUIT, QUICK_ATTACK, DIG, DETECT + db 42, HITMONLEE, SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT db 42, HITMONCHAN, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH - db 43, ONIX, BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE - db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP + db 43, ONIX, BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE + db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db -1 ; end ; ================================ @@ -278,11 +278,11 @@ KarenGroup: ; ================================ ; KAREN (1) db "KAREN@", TRAINERTYPE_MOVES - db 42, UMBREON, SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK - db 42, VILEPLUME, STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE - db 45, GENGAR, LICK, SPITE, CURSE, DESTINY_BOND - db 44, MURKROW, QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK - db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH + db 42, UMBREON, SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK + db 42, VILEPLUME, STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE + db 45, GENGAR, LICK, SPITE, CURSE, DESTINY_BOND + db 44, MURKROW, QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK + db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH db -1 ; end ; ================================ @@ -291,11 +291,11 @@ KogaGroup: ; ================================ ; KOGA (1) db "KOGA@", TRAINERTYPE_MOVES - db 40, ARIADOS, DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN - db 41, VENOMOTH, SUPERSONIC, GUST, PSYCHIC_M, TOXIC + db 40, ARIADOS, DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN + db 41, VENOMOTH, SUPERSONIC, GUST, PSYCHIC_M, TOXIC db 43, FORRETRESS, PROTECT, SWIFT, EXPLOSION, SPIKES - db 42, MUK, MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC - db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC + db 42, MUK, MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC + db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db -1 ; end ; ================================ @@ -304,12 +304,12 @@ ChampionGroup: ; ================================ ; CHAMPION (1) db "LANCE@", TRAINERTYPE_MOVES - db 44, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM - db 47, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM - db 47, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM + db 44, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM + db 47, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM + db 47, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM db 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM - db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM - db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM + db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM + db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db -1 ; end ; ================================ @@ -318,11 +318,11 @@ BrockGroup: ; ================================ ; BROCK (1) db "BROCK@", TRAINERTYPE_MOVES - db 41, GRAVELER, DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE - db 41, RHYHORN, FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL - db 42, OMASTAR, BITE, SURF, PROTECT, SPIKE_CANNON - db 44, ONIX, BIND, ROCK_SLIDE, BIDE, SANDSTORM - db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN + db 41, GRAVELER, DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE + db 41, RHYHORN, FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL + db 42, OMASTAR, BITE, SURF, PROTECT, SPIKE_CANNON + db 44, ONIX, BIND, ROCK_SLIDE, BIDE, SANDSTORM + db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN db -1 ; end ; ================================ @@ -331,10 +331,10 @@ MistyGroup: ; ================================ ; MISTY (1) db "MISTY@", TRAINERTYPE_MOVES - db 42, GOLDUCK, SURF, DISABLE, PSYCH_UP, PSYCHIC_M - db 42, QUAGSIRE, SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE - db 44, LAPRAS, SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE - db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM + db 42, GOLDUCK, SURF, DISABLE, PSYCH_UP, PSYCHIC_M + db 42, QUAGSIRE, SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE + db 44, LAPRAS, SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE + db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM db -1 ; end ; ================================ @@ -343,10 +343,10 @@ LtSurgeGroup: ; ================================ ; LT_SURGE (1) db "LT.SURGE@", TRAINERTYPE_MOVES - db 44, RAICHU, THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER - db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION - db 40, MAGNETON, LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON - db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION + db 44, RAICHU, THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER + db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION + db 40, MAGNETON, LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON + db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER db -1 ; end ; ================================ @@ -381,7 +381,7 @@ ScientistGroup: ; SCIENTIST (5) db "RICH@", TRAINERTYPE_MOVES - db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK + db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end ; ================================ @@ -390,10 +390,10 @@ ErikaGroup: ; ================================ ; ERIKA (1) db "ERIKA@", TRAINERTYPE_MOVES - db 42, TANGELA, VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER - db 41, JUMPLUFF, MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN + db 42, TANGELA, VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER + db 41, JUMPLUFF, MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF - db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM + db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM db -1 ; end ; ================================ @@ -402,19 +402,19 @@ YoungsterGroup: ; ================================ ; YOUNGSTER (1) db "JOEY@", TRAINERTYPE_NORMAL - db 4, RATTATA + db 4, RATTATA db -1 ; end ; YOUNGSTER (2) db "MIKEY@", TRAINERTYPE_NORMAL - db 2, PIDGEY - db 4, RATTATA + db 2, PIDGEY + db 4, RATTATA db -1 ; end ; YOUNGSTER (3) db "ALBERT@", TRAINERTYPE_NORMAL - db 6, RATTATA - db 8, ZUBAT + db 6, RATTATA + db 8, ZUBAT db -1 ; end ; YOUNGSTER (4) @@ -424,10 +424,10 @@ YoungsterGroup: ; YOUNGSTER (5) db "SAMUEL@", TRAINERTYPE_NORMAL - db 7, RATTATA + db 7, RATTATA db 10, SANDSHREW - db 8, SPEAROW - db 8, SPEAROW + db 8, SPEAROW + db 8, SPEAROW db -1 ; end ; YOUNGSTER (6) @@ -443,7 +443,7 @@ YoungsterGroup: ; YOUNGSTER (8) db "JOEY@", TRAINERTYPE_MOVES - db 21, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE + db 21, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE db -1 ; end ; YOUNGSTER (9) @@ -470,12 +470,12 @@ YoungsterGroup: ; YOUNGSTER (13) db "JOEY@", TRAINERTYPE_MOVES - db 30, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT + db 30, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT db -1 ; end ; YOUNGSTER (14) db "JOEY@", TRAINERTYPE_MOVES - db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT + db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT db -1 ; end ; ================================ @@ -604,9 +604,9 @@ SchoolboyGroup: ; SCHOOLBOY (20) db "JACK@", TRAINERTYPE_MOVES - db 35, ELECTRODE, SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN - db 35, GROWLITHE, SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL - db 37, VILEPLUME, SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT + db 35, ELECTRODE, SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN + db 35, GROWLITHE, SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL + db 37, VILEPLUME, SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT db -1 ; end ; SCHOOLBOY (21) @@ -619,10 +619,10 @@ SchoolboyGroup: ; SCHOOLBOY (22) db "ALAN@", TRAINERTYPE_MOVES - db 35, XATU, PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT - db 32, TANGELA, POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN - db 32, YANMA, QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC - db 35, QUAGSIRE, TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE + db 35, XATU, PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT + db 32, TANGELA, POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN + db 32, YANMA, QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC + db 35, QUAGSIRE, TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE db -1 ; end ; SCHOOLBOY (23) @@ -633,8 +633,8 @@ SchoolboyGroup: ; SCHOOLBOY (24) db "CHAD@", TRAINERTYPE_MOVES - db 34, MR__MIME, PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE - db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT + db 34, MR__MIME, PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE + db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT db -1 ; end ; ================================ @@ -643,13 +643,13 @@ BirdKeeperGroup: ; ================================ ; BIRD_KEEPER (1) db "ROD@", TRAINERTYPE_NORMAL - db 7, PIDGEY - db 7, PIDGEY + db 7, PIDGEY + db 7, PIDGEY db -1 ; end ; BIRD_KEEPER (2) db "ABE@", TRAINERTYPE_NORMAL - db 9, SPEAROW + db 9, SPEAROW db -1 ; end ; BIRD_KEEPER (3) @@ -718,9 +718,9 @@ BirdKeeperGroup: ; BIRD_KEEPER (13) db "PETER@", TRAINERTYPE_NORMAL - db 6, PIDGEY - db 6, PIDGEY - db 8, SPEAROW + db 6, PIDGEY + db 6, PIDGEY + db 8, SPEAROW db -1 ; end ; BIRD_KEEPER (14) @@ -752,8 +752,8 @@ BirdKeeperGroup: ; BIRD_KEEPER (19) db "VANCE@", TRAINERTYPE_MOVES - db 38, PIDGEOT, TOXIC, QUICK_ATTACK, WHIRLWIND, FLY - db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY + db 38, PIDGEOT, TOXIC, QUICK_ATTACK, WHIRLWIND, FLY + db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY db -1 ; end ; ================================ @@ -762,7 +762,7 @@ LassGroup: ; ================================ ; LASS (1) db "CARRIE@", TRAINERTYPE_MOVES - db 18, SNUBBULL, SCARY_FACE, CHARM, BITE, LICK + db 18, SNUBBULL, SCARY_FACE, CHARM, BITE, LICK db -1 ; end ; LASS (2) @@ -820,8 +820,8 @@ LassGroup: ; LASS (10) db "DANA@", TRAINERTYPE_MOVES - db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION db -1 ; end ; LASS (11) @@ -842,26 +842,26 @@ LassGroup: ; LASS (14) db "DANA@", TRAINERTYPE_MOVES - db 21, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 21, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 21, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 21, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION db -1 ; end ; LASS (15) db "DANA@", TRAINERTYPE_MOVES - db 29, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH - db 29, AMPHAROS, TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE + db 29, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH + db 29, AMPHAROS, TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE db -1 ; end ; LASS (16) db "DANA@", TRAINERTYPE_MOVES - db 32, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH - db 32, AMPHAROS, TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE + db 32, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH + db 32, AMPHAROS, TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE db -1 ; end ; LASS (17) db "DANA@", TRAINERTYPE_MOVES - db 36, AMPHAROS, SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE - db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH + db 36, AMPHAROS, SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE + db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH db -1 ; end ; ================================ @@ -870,11 +870,11 @@ JanineGroup: ; ================================ ; JANINE (1) db "JANINE@", TRAINERTYPE_MOVES - db 36, CROBAT, SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK - db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION - db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION - db 33, ARIADOS, SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE - db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M + db 36, CROBAT, SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK + db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION + db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION + db 33, ARIADOS, SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE + db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M db -1 ; end ; ================================ @@ -884,8 +884,8 @@ CooltrainerMGroup: ; COOLTRAINERM (1) db "NICK@", TRAINERTYPE_MOVES db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE - db 26, SQUIRTLE, WITHDRAW, WATER_GUN, BITE, CURSE - db 26, BULBASAUR, LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF + db 26, SQUIRTLE, WITHDRAW, WATER_GUN, BITE, CURSE + db 26, BULBASAUR, LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF db -1 ; end ; COOLTRAINERM (2) @@ -916,46 +916,46 @@ CooltrainerMGroup: ; COOLTRAINERM (6) db "GAVEN@", TRAINERTYPE_MOVES db 35, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF - db 35, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT - db 35, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN + db 35, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT + db 35, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end ; COOLTRAINERM (7) db "GAVEN@", TRAINERTYPE_ITEM_MOVES - db 39, VICTREEBEL, NO_ITEM, GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF - db 39, KINGLER, KINGS_ROCK, SURF, STOMP, GUILLOTINE, BLIZZARD - db 39, FLAREON, NO_ITEM, FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN + db 39, VICTREEBEL, NO_ITEM, GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF + db 39, KINGLER, KINGS_ROCK, SURF, STOMP, GUILLOTINE, BLIZZARD + db 39, FLAREON, NO_ITEM, FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end ; COOLTRAINERM (8) db "RYAN@", TRAINERTYPE_MOVES - db 25, PIDGEOT, SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK + db 25, PIDGEOT, SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK db 27, ELECTABUZZ, THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH db -1 ; end ; COOLTRAINERM (9) db "JAKE@", TRAINERTYPE_MOVES - db 33, PARASECT, LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE - db 35, GOLDUCK, CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES + db 33, PARASECT, LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE + db 35, GOLDUCK, CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES db -1 ; end ; COOLTRAINERM (10) db "GAVEN@", TRAINERTYPE_MOVES db 32, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF - db 32, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT - db 32, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN + db 32, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT + db 32, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end ; COOLTRAINERM (11) db "BLAKE@", TRAINERTYPE_MOVES - db 33, MAGNETON, THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH - db 31, QUAGSIRE, WATER_GUN, SLAM, AMNESIA, EARTHQUAKE - db 31, EXEGGCUTE, LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM + db 33, MAGNETON, THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH + db 31, QUAGSIRE, WATER_GUN, SLAM, AMNESIA, EARTHQUAKE + db 31, EXEGGCUTE, LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM db -1 ; end ; COOLTRAINERM (12) db "BRIAN@", TRAINERTYPE_MOVES - db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT + db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT db -1 ; end ; COOLTRAINERM (13) @@ -1007,7 +1007,7 @@ CooltrainerMGroup: ; COOLTRAINERM (20) db "DARIN@", TRAINERTYPE_MOVES - db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM + db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM db -1 ; end ; ================================ @@ -1024,8 +1024,8 @@ CooltrainerFGroup: ; COOLTRAINERF (2) db "LOIS@", TRAINERTYPE_MOVES - db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED - db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD + db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED + db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD db -1 ; end ; COOLTRAINERF (3) @@ -1060,13 +1060,13 @@ CooltrainerFGroup: ; COOLTRAINERF (8) db "JOYCE@", TRAINERTYPE_MOVES - db 36, PIKACHU, QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER - db 32, BLASTOISE, BITE, CURSE, SURF, RAIN_DANCE + db 36, PIKACHU, QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER + db 32, BLASTOISE, BITE, CURSE, SURF, RAIN_DANCE db -1 ; end ; COOLTRAINERF (9) db "BETH@", TRAINERTYPE_MOVES - db 36, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY + db 36, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY db -1 ; end ; COOLTRAINERF (10) @@ -1078,14 +1078,14 @@ CooltrainerFGroup: ; COOLTRAINERF (11) db "MEGAN@", TRAINERTYPE_MOVES - db 32, BULBASAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF - db 32, IVYSAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF - db 32, VENUSAUR, BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT + db 32, BULBASAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32, IVYSAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32, VENUSAUR, BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT db -1 ; end ; COOLTRAINERF (12) db "BETH@", TRAINERTYPE_MOVES - db 39, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY + db 39, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY db -1 ; end ; COOLTRAINERF (13) @@ -1109,7 +1109,7 @@ CooltrainerFGroup: ; COOLTRAINERF (16) db "CYBIL@", TRAINERTYPE_MOVES db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST - db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM + db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM db -1 ; end ; COOLTRAINERF (17) @@ -1120,7 +1120,7 @@ CooltrainerFGroup: ; COOLTRAINERF (18) db "BETH@", TRAINERTYPE_ITEM_MOVES - db 43, RAPIDASH, FOCUS_BAND, STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST + db 43, RAPIDASH, FOCUS_BAND, STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db -1 ; end ; COOLTRAINERF (19) @@ -1132,16 +1132,16 @@ CooltrainerFGroup: ; COOLTRAINERF (20) db "REENA@", TRAINERTYPE_ITEM_MOVES - db 38, STARMIE, NO_ITEM, DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY - db 40, NIDOQUEEN, PINK_BOW, EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM - db 38, STARMIE, NO_ITEM, BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER + db 38, STARMIE, NO_ITEM, DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY + db 40, NIDOQUEEN, PINK_BOW, EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM + db 38, STARMIE, NO_ITEM, BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER db -1 ; end ; COOLTRAINERF (21) db "CARA@", TRAINERTYPE_MOVES - db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER - db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER - db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER + db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER + db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER + db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER db -1 ; end ; ================================ @@ -1150,15 +1150,15 @@ BeautyGroup: ; ================================ ; BEAUTY (1) db "VICTORIA@", TRAINERTYPE_NORMAL - db 9, SENTRET + db 9, SENTRET db 13, SENTRET db 17, SENTRET db -1 ; end ; BEAUTY (2) db "SAMANTHA@", TRAINERTYPE_MOVES - db 16, MEOWTH, SCRATCH, GROWL, BITE, PAY_DAY - db 16, MEOWTH, SCRATCH, GROWL, BITE, SLASH + db 16, MEOWTH, SCRATCH, GROWL, BITE, PAY_DAY + db 16, MEOWTH, SCRATCH, GROWL, BITE, SLASH db -1 ; end ; BEAUTY (3) @@ -1233,8 +1233,8 @@ BeautyGroup: ; BEAUTY (16) db "VALERIE@", TRAINERTYPE_MOVES - db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER - db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE + db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER + db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE db -1 ; end ; BEAUTY (17) @@ -1296,12 +1296,12 @@ PokemaniacGroup: ; POKEMANIAC (10) db "BRENT@", TRAINERTYPE_MOVES - db 36, PORYGON, RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK + db 36, PORYGON, RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK db -1 ; end ; POKEMANIAC (11) db "ISSAC@", TRAINERTYPE_MOVES - db 12, LICKITUNG, LICK, SUPERSONIC, CUT, NO_MOVE + db 12, LICKITUNG, LICK, SUPERSONIC, CUT, NO_MOVE db -1 ; end ; POKEMANIAC (12) @@ -1317,7 +1317,7 @@ PokemaniacGroup: ; POKEMANIAC (14) db "BRENT@", TRAINERTYPE_MOVES - db 41, CHANSEY, ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED + db 41, CHANSEY, ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED db -1 ; end ; POKEMANIAC (15) @@ -1337,9 +1337,9 @@ GruntMGroup: ; GRUNTM (2) db "GRUNT@", TRAINERTYPE_NORMAL - db 7, RATTATA - db 9, ZUBAT - db 9, ZUBAT + db 7, RATTATA + db 9, ZUBAT + db 9, ZUBAT db -1 ; end ; GRUNTM (3) @@ -1504,8 +1504,8 @@ GruntMGroup: ; GRUNTM (29) db "GRUNT@", TRAINERTYPE_NORMAL - db 9, RATTATA - db 9, RATTATA + db 9, RATTATA + db 9, RATTATA db -1 ; end ; GRUNTM (30) @@ -1591,9 +1591,9 @@ SabrinaGroup: ; ================================ ; SABRINA (1) db "SABRINA@", TRAINERTYPE_MOVES - db 46, ESPEON, SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M - db 46, MR__MIME, BARRIER, REFLECT, BATON_PASS, PSYCHIC_M - db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 46, ESPEON, SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M + db 46, MR__MIME, BARRIER, REFLECT, BATON_PASS, PSYCHIC_M + db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db -1 ; end ; ================================ @@ -1602,8 +1602,8 @@ BugCatcherGroup: ; ================================ ; BUG_CATCHER (1) db "DON@", TRAINERTYPE_NORMAL - db 3, CATERPIE - db 3, CATERPIE + db 3, CATERPIE + db 3, CATERPIE db -1 ; end ; BUG_CATCHER (2) @@ -1621,16 +1621,16 @@ BugCatcherGroup: ; BUG_CATCHER (4) db "WADE@", TRAINERTYPE_NORMAL - db 2, CATERPIE - db 2, CATERPIE - db 3, WEEDLE - db 2, CATERPIE + db 2, CATERPIE + db 2, CATERPIE + db 3, WEEDLE + db 2, CATERPIE db -1 ; end ; BUG_CATCHER (5) db "BENNY@", TRAINERTYPE_NORMAL - db 7, WEEDLE - db 9, KAKUNA + db 7, WEEDLE + db 9, KAKUNA db 12, BEEDRILL db -1 ; end @@ -1658,10 +1658,10 @@ BugCatcherGroup: ; BUG_CATCHER (10) db "WADE@", TRAINERTYPE_NORMAL - db 9, METAPOD - db 9, METAPOD + db 9, METAPOD + db 9, METAPOD db 10, KAKUNA - db 9, METAPOD + db 9, METAPOD db -1 ; end ; BUG_CATCHER (11) @@ -1684,14 +1684,14 @@ BugCatcherGroup: ; BUG_CATCHER (14) db "ARNIE@", TRAINERTYPE_MOVES - db 28, VENOMOTH, DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE + db 28, VENOMOTH, DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE db -1 ; end ; BUG_CATCHER (15) db "WADE@", TRAINERTYPE_MOVES db 24, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND db 24, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND - db 25, BEEDRILL, FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE + db 25, BEEDRILL, FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE db 24, BUTTERFREE, CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND db -1 ; end @@ -1699,23 +1699,23 @@ BugCatcherGroup: db "WADE@", TRAINERTYPE_MOVES db 30, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, GUST db 30, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, GUST - db 32, BEEDRILL, FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM + db 32, BEEDRILL, FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM db 34, BUTTERFREE, PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND db -1 ; end ; BUG_CATCHER (17) db "ARNIE@", TRAINERTYPE_MOVES - db 36, VENOMOTH, GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE + db 36, VENOMOTH, GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE db -1 ; end ; BUG_CATCHER (18) db "ARNIE@", TRAINERTYPE_MOVES - db 40, VENOMOTH, GUST, SUPERSONIC, PSYCHIC_M, TOXIC + db 40, VENOMOTH, GUST, SUPERSONIC, PSYCHIC_M, TOXIC db -1 ; end ; BUG_CATCHER (19) db "WAYNE@", TRAINERTYPE_NORMAL - db 8, LEDYBA + db 8, LEDYBA db 10, PARAS db -1 ; end ; ================================ @@ -1725,10 +1725,10 @@ FisherGroup: ; ================================ ; FISHER (1) db "JUSTIN@", TRAINERTYPE_NORMAL - db 5, MAGIKARP - db 5, MAGIKARP + db 5, MAGIKARP + db 5, MAGIKARP db 15, MAGIKARP - db 5, MAGIKARP + db 5, MAGIKARP db -1 ; end ; FISHER (2) @@ -1750,8 +1750,8 @@ FisherGroup: ; FISHER (5) db "HENRY@", TRAINERTYPE_NORMAL - db 8, POLIWAG - db 8, POLIWAG + db 8, POLIWAG + db 8, POLIWAG db -1 ; end ; FISHER (6) @@ -1789,8 +1789,8 @@ FisherGroup: ; FISHER (11) db "EDGAR@", TRAINERTYPE_MOVES - db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM - db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM db -1 ; end ; FISHER (12) @@ -1861,9 +1861,9 @@ FisherGroup: ; FISHER (22) db "WILTON@", TRAINERTYPE_MOVES - db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK - db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK - db 38, REMORAID, PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM + db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK + db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK + db 38, REMORAID, PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM db -1 ; end ; FISHER (23) @@ -1874,15 +1874,15 @@ FisherGroup: ; FISHER (24) db "RALPH@", TRAINERTYPE_MOVES - db 35, QWILFISH, TOXIC, MINIMIZE, SURF, PIN_MISSILE - db 39, SEAKING, ENDURE, FLAIL, FURY_ATTACK, WATERFALL + db 35, QWILFISH, TOXIC, MINIMIZE, SURF, PIN_MISSILE + db 39, SEAKING, ENDURE, FLAIL, FURY_ATTACK, WATERFALL db -1 ; end ; FISHER (25) db "TULLY@", TRAINERTYPE_MOVES - db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK - db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK - db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN + db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK + db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK + db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN db -1 ; end ; ================================ @@ -2053,8 +2053,8 @@ SwimmerFGroup: ; SWIMMERF (4) db "SUSIE@", TRAINERTYPE_MOVES - db 20, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION - db 22, GOLDEEN, PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK + db 20, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 22, GOLDEEN, PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK db -1 ; end ; SWIMMERF (5) @@ -2070,8 +2070,8 @@ SwimmerFGroup: ; SWIMMERF (7) db "WENDY@", TRAINERTYPE_MOVES - db 21, HORSEA, BUBBLE, SMOKESCREEN, LEER, WATER_GUN - db 21, HORSEA, DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN + db 21, HORSEA, BUBBLE, SMOKESCREEN, LEER, WATER_GUN + db 21, HORSEA, DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN db -1 ; end ; SWIMMERF (8) @@ -2165,8 +2165,8 @@ SailorGroup: ; SAILOR (4) db "KENT@", TRAINERTYPE_MOVES - db 18, KRABBY, BUBBLE, LEER, VICEGRIP, HARDEN - db 20, KRABBY, BUBBLEBEAM, LEER, VICEGRIP, HARDEN + db 18, KRABBY, BUBBLE, LEER, VICEGRIP, HARDEN + db 20, KRABBY, BUBBLEBEAM, LEER, VICEGRIP, HARDEN db -1 ; end ; SAILOR (5) @@ -2221,8 +2221,8 @@ SailorGroup: ; SAILOR (13) db "HUEY@", TRAINERTYPE_MOVES - db 38, POLITOED, WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG - db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION + db 38, POLITOED, WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG + db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION db -1 ; end ; ================================ @@ -2285,10 +2285,10 @@ SuperNerdGroup: ; SUPER_NERD (10) db "TERU@", TRAINERTYPE_NORMAL - db 7, MAGNEMITE + db 7, MAGNEMITE db 11, VOLTORB - db 7, MAGNEMITE - db 9, MAGNEMITE + db 7, MAGNEMITE + db 9, MAGNEMITE db -1 ; end ; SUPER_NERD (11) @@ -2300,17 +2300,17 @@ SuperNerdGroup: ; SUPER_NERD (12) db "NORTON@", TRAINERTYPE_MOVES - db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK + db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end ; SUPER_NERD (13) db "HUGH@", TRAINERTYPE_MOVES - db 39, SEADRA, SMOKESCREEN, TWISTER, SURF, WATERFALL + db 39, SEADRA, SMOKESCREEN, TWISTER, SURF, WATERFALL db -1 ; end ; SUPER_NERD (14) db "MARKUS@", TRAINERTYPE_MOVES - db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH + db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH db -1 ; end ; ================================ @@ -2319,61 +2319,61 @@ Rival2Group: ; ================================ ; RIVAL2 (1) db "?@", TRAINERTYPE_MOVES - db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M - db 45, MEGANIUM, RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 45, MEGANIUM, RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN db -1 ; end ; RIVAL2 (2) db "?@", TRAINERTYPE_MOVES - db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M db 45, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT db -1 ; end ; RIVAL2 (3) db "?@", TRAINERTYPE_MOVES - db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M db 45, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end ; RIVAL2 (4) db "?@", TRAINERTYPE_MOVES - db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT - db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT - db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD db -1 ; end ; RIVAL2 (5) db "?@", TRAINERTYPE_MOVES - db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT - db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db 50, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT db -1 ; end ; RIVAL2 (6) db "?@", TRAINERTYPE_MOVES - db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER - db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT - db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH db -1 ; end ; ================================ @@ -2406,9 +2406,9 @@ HikerGroup: ; HIKER (2) db "RUSSELL@", TRAINERTYPE_NORMAL - db 4, GEODUDE - db 6, GEODUDE - db 8, GEODUDE + db 4, GEODUDE + db 6, GEODUDE + db 8, GEODUDE db -1 ; end ; HIKER (3) @@ -2459,8 +2459,8 @@ HikerGroup: ; HIKER (10) db "TIMOTHY@", TRAINERTYPE_MOVES - db 27, DIGLETT, MAGNITUDE, DIG, SAND_ATTACK, SLASH - db 27, DUGTRIO, MAGNITUDE, DIG, SAND_ATTACK, SLASH + db 27, DIGLETT, MAGNITUDE, DIG, SAND_ATTACK, SLASH + db 27, DUGTRIO, MAGNITUDE, DIG, SAND_ATTACK, SLASH db -1 ; end ; HIKER (11) @@ -2518,9 +2518,9 @@ HikerGroup: ; HIKER (19) db "PARRY@", TRAINERTYPE_MOVES - db 35, PILOSWINE, EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN - db 35, DUGTRIO, MAGNITUDE, DIG, MUD_SLAP, SLASH - db 38, STEELIX, DIG, IRON_TAIL, SANDSTORM, SLAM + db 35, PILOSWINE, EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN + db 35, DUGTRIO, MAGNITUDE, DIG, MUD_SLAP, SLASH + db 38, STEELIX, DIG, IRON_TAIL, SANDSTORM, SLAM db -1 ; end ; HIKER (20) @@ -2537,9 +2537,9 @@ HikerGroup: ; HIKER (22) db "ANTHONY@", TRAINERTYPE_MOVES - db 34, GRAVELER, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT - db 36, GOLEM, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT - db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG + db 34, GRAVELER, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT + db 36, GOLEM, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT + db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG db -1 ; end ; ================================ @@ -2610,9 +2610,9 @@ BlaineGroup: ; ================================ ; BLAINE (1) db "BLAINE@", TRAINERTYPE_MOVES - db 45, MAGCARGO, CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE - db 45, MAGMAR, THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY - db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST + db 45, MAGCARGO, CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE + db 45, MAGMAR, THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY + db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db -1 ; end ; ================================ @@ -2628,8 +2628,8 @@ BurglarGroup: ; BURGLAR (2) db "EDDIE@", TRAINERTYPE_MOVES - db 26, GROWLITHE, ROAR, EMBER, LEER, TAKE_DOWN - db 24, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN + db 26, GROWLITHE, ROAR, EMBER, LEER, TAKE_DOWN + db 24, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN db -1 ; end ; BURGLAR (3) @@ -2671,8 +2671,8 @@ FirebreatherGroup: ; FIREBREATHER (5) db "BILL@", TRAINERTYPE_NORMAL - db 6, KOFFING - db 6, KOFFING + db 6, KOFFING + db 6, KOFFING db -1 ; end ; FIREBREATHER (6) @@ -2683,7 +2683,7 @@ FirebreatherGroup: ; FIREBREATHER (7) db "RAY@", TRAINERTYPE_NORMAL - db 9, VULPIX + db 9, VULPIX db -1 ; end ; FIREBREATHER (8) @@ -2699,8 +2699,8 @@ JugglerGroup: ; ================================ ; JUGGLER (1) db "IRWIN@", TRAINERTYPE_NORMAL - db 2, VOLTORB - db 6, VOLTORB + db 2, VOLTORB + db 6, VOLTORB db 10, VOLTORB db 14, VOLTORB db -1 ; end @@ -2722,7 +2722,7 @@ JugglerGroup: ; JUGGLER (4) db "IRWIN@", TRAINERTYPE_NORMAL - db 6, VOLTORB + db 6, VOLTORB db 10, VOLTORB db 14, VOLTORB db 18, VOLTORB @@ -2758,15 +2758,15 @@ BlackbeltGroup: ; BLACKBELT_T (2) db "YOSHI@", TRAINERTYPE_MOVES - db 27, HITMONLEE, DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY + db 27, HITMONLEE, DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY db -1 ; end ; BLACKBELT_T (3) db "KENJI@", TRAINERTYPE_MOVES - db 33, ONIX, BIND, ROCK_THROW, TOXIC, DIG - db 38, MACHAMP, HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW - db 33, STEELIX, EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM - db 36, HITMONLEE, DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT + db 33, ONIX, BIND, ROCK_THROW, TOXIC, DIG + db 38, MACHAMP, HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW + db 33, STEELIX, EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM + db 36, HITMONLEE, DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT db -1 ; end ; BLACKBELT_T (4) @@ -2776,8 +2776,8 @@ BlackbeltGroup: ; BLACKBELT_T (5) db "NOB@", TRAINERTYPE_MOVES - db 25, MACHOP, LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS - db 25, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE + db 25, MACHOP, LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS + db 25, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE db -1 ; end ; BLACKBELT_T (6) @@ -2811,24 +2811,24 @@ ExecutiveMGroup: ; ================================ ; EXECUTIVEM (1) db "EXECUTIVE@", TRAINERTYPE_MOVES - db 33, HOUNDOUR, EMBER, ROAR, BITE, FAINT_ATTACK - db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE - db 35, HOUNDOOM, EMBER, SMOG, BITE, FAINT_ATTACK + db 33, HOUNDOUR, EMBER, ROAR, BITE, FAINT_ATTACK + db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE + db 35, HOUNDOOM, EMBER, SMOG, BITE, FAINT_ATTACK db -1 ; end ; EXECUTIVEM (2) db "EXECUTIVE@", TRAINERTYPE_MOVES - db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK db -1 ; end ; EXECUTIVEM (3) db "EXECUTIVE@", TRAINERTYPE_MOVES - db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 32, WEEZING, TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN - db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN - db 30, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 32, WEEZING, TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN db -1 ; end ; EXECUTIVEM (4) @@ -2866,26 +2866,26 @@ PsychicGroup: ; PSYCHIC_T (5) db "GREG@", TRAINERTYPE_MOVES - db 17, DROWZEE, HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE + db 17, DROWZEE, HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE db -1 ; end ; PSYCHIC_T (6) db "NORMAN@", TRAINERTYPE_MOVES - db 17, SLOWPOKE, TACKLE, GROWL, WATER_GUN, NO_MOVE - db 20, SLOWPOKE, CURSE, BODY_SLAM, WATER_GUN, CONFUSION + db 17, SLOWPOKE, TACKLE, GROWL, WATER_GUN, NO_MOVE + db 20, SLOWPOKE, CURSE, BODY_SLAM, WATER_GUN, CONFUSION db -1 ; end ; PSYCHIC_T (7) db "MARK@", TRAINERTYPE_MOVES - db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE - db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE - db 15, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE + db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 15, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE db -1 ; end ; PSYCHIC_T (8) db "PHIL@", TRAINERTYPE_MOVES - db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY - db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY + db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT db -1 ; end ; PSYCHIC_T (9) @@ -2919,19 +2919,19 @@ PicnickerGroup: ; ================================ ; PICNICKER (1) db "LIZ@", TRAINERTYPE_NORMAL - db 9, NIDORAN_F + db 9, NIDORAN_F db -1 ; end ; PICNICKER (2) db "GINA@", TRAINERTYPE_NORMAL - db 9, HOPPIP - db 9, HOPPIP + db 9, HOPPIP + db 9, HOPPIP db 12, BULBASAUR db -1 ; end ; PICNICKER (3) db "BROOKE@", TRAINERTYPE_MOVES - db 16, PIKACHU, THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM + db 16, PIKACHU, THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM db -1 ; end ; PICNICKER (4) @@ -3007,12 +3007,12 @@ PicnickerGroup: ; PICNICKER (16) db "TIFFANY@", TRAINERTYPE_MOVES - db 31, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE + db 31, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE db -1 ; end ; PICNICKER (17) db "TIFFANY@", TRAINERTYPE_MOVES - db 37, CLEFAIRY, ENCORE, DOUBLESLAP, MINIMIZE, METRONOME + db 37, CLEFAIRY, ENCORE, DOUBLESLAP, MINIMIZE, METRONOME db -1 ; end ; PICNICKER (18) @@ -3028,14 +3028,14 @@ PicnickerGroup: ; PICNICKER (20) db "TIFFANY@", TRAINERTYPE_MOVES - db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE + db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE db -1 ; end ; PICNICKER (21) db "ERIN@", TRAINERTYPE_MOVES - db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY - db 34, RAICHU, SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT - db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY + db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY + db 34, RAICHU, SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT + db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY db -1 ; end ; PICNICKER (22) @@ -3048,8 +3048,8 @@ PicnickerGroup: ; PICNICKER (23) db "LIZ@", TRAINERTYPE_MOVES db 30, WEEPINBELL, SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB - db 32, NIDOKING, EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL - db 32, NIDOQUEEN, EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM + db 32, NIDOKING, EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL + db 32, NIDOQUEEN, EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM db -1 ; end ; PICNICKER (24) @@ -3061,14 +3061,14 @@ PicnickerGroup: ; PICNICKER (25) db "GINA@", TRAINERTYPE_MOVES - db 33, JUMPLUFF, STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE - db 33, JUMPLUFF, SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE - db 38, VENUSAUR, SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP + db 33, JUMPLUFF, STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE + db 33, JUMPLUFF, SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE + db 38, VENUSAUR, SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP db -1 ; end ; PICNICKER (26) db "TIFFANY@", TRAINERTYPE_MOVES - db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE + db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE db -1 ; end ; ================================ @@ -3077,7 +3077,7 @@ CamperGroup: ; ================================ ; CAMPER (1) db "ROLAND@", TRAINERTYPE_NORMAL - db 9, NIDORAN_M + db 9, NIDORAN_M db -1 ; end ; CAMPER (2) @@ -3204,10 +3204,10 @@ CamperGroup: ; CAMPER (21) db "TODD@", TRAINERTYPE_MOVES - db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE - db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE - db 36, MAGCARGO, ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER - db 34, GOLDUCK, DISABLE, PSYCHIC_M, SURF, PSYCH_UP + db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE + db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE + db 36, MAGCARGO, ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER + db 34, GOLDUCK, DISABLE, PSYCHIC_M, SURF, PSYCH_UP db -1 ; end ; CAMPER (22) @@ -3223,16 +3223,16 @@ ExecutiveFGroup: ; ================================ ; EXECUTIVEF (1) db "EXECUTIVE@", TRAINERTYPE_MOVES - db 32, ARBOK, WRAP, POISON_STING, BITE, GLARE - db 32, VILEPLUME, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID - db 32, MURKROW, PECK, PURSUIT, HAZE, NIGHT_SHADE + db 32, ARBOK, WRAP, POISON_STING, BITE, GLARE + db 32, VILEPLUME, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 32, MURKROW, PECK, PURSUIT, HAZE, NIGHT_SHADE db -1 ; end ; EXECUTIVEF (2) db "EXECUTIVE@", TRAINERTYPE_MOVES - db 23, ARBOK, WRAP, LEER, POISON_STING, BITE - db 23, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID - db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE + db 23, ARBOK, WRAP, LEER, POISON_STING, BITE + db 23, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE db -1 ; end ; ================================ @@ -3241,27 +3241,27 @@ SageGroup: ; ================================ ; SAGE (1) db "CHOW@", TRAINERTYPE_NORMAL - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end ; SAGE (2) db "NICO@", TRAINERTYPE_NORMAL - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end ; SAGE (3) db "JIN@", TRAINERTYPE_NORMAL - db 6, BELLSPROUT + db 6, BELLSPROUT db -1 ; end ; SAGE (4) db "TROY@", TRAINERTYPE_NORMAL - db 7, BELLSPROUT - db 7, HOOTHOOT + db 7, BELLSPROUT + db 7, HOOTHOOT db -1 ; end ; SAGE (5) @@ -3280,20 +3280,20 @@ SageGroup: ; SAGE (7) db "EDMOND@", TRAINERTYPE_NORMAL - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end ; SAGE (8) db "NEAL@", TRAINERTYPE_NORMAL - db 6, BELLSPROUT + db 6, BELLSPROUT db -1 ; end ; SAGE (9) db "LI@", TRAINERTYPE_NORMAL - db 7, BELLSPROUT - db 7, BELLSPROUT + db 7, BELLSPROUT + db 7, BELLSPROUT db 10, HOOTHOOT db -1 ; end @@ -3389,83 +3389,83 @@ PokefanMGroup: ; ================================ ; POKEFANM (1) db "WILLIAM@", TRAINERTYPE_ITEM - db 14, RAICHU, BERRY + db 14, RAICHU, BERRY db -1 ; end ; POKEFANM (2) db "DEREK@", TRAINERTYPE_ITEM - db 17, PIKACHU, BERRY + db 17, PIKACHU, BERRY db -1 ; end ; POKEFANM (3) db "ROBERT@", TRAINERTYPE_ITEM - db 33, QUAGSIRE, BERRY + db 33, QUAGSIRE, BERRY db -1 ; end ; POKEFANM (4) db "JOSHUA@", TRAINERTYPE_ITEM - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY db -1 ; end ; POKEFANM (5) db "CARTER@", TRAINERTYPE_ITEM - db 29, BULBASAUR, BERRY + db 29, BULBASAUR, BERRY db 29, CHARMANDER, BERRY - db 29, SQUIRTLE, BERRY + db 29, SQUIRTLE, BERRY db -1 ; end ; POKEFANM (6) db "TREVOR@", TRAINERTYPE_ITEM - db 33, PSYDUCK, BERRY + db 33, PSYDUCK, BERRY db -1 ; end ; POKEFANM (7) db "BRANDON@", TRAINERTYPE_ITEM - db 13, SNUBBULL, BERRY + db 13, SNUBBULL, BERRY db -1 ; end ; POKEFANM (8) db "JEREMY@", TRAINERTYPE_ITEM - db 28, MEOWTH, BERRY - db 28, MEOWTH, BERRY - db 28, MEOWTH, BERRY + db 28, MEOWTH, BERRY + db 28, MEOWTH, BERRY + db 28, MEOWTH, BERRY db -1 ; end ; POKEFANM (9) db "COLIN@", TRAINERTYPE_ITEM - db 32, DELIBIRD, BERRY + db 32, DELIBIRD, BERRY db -1 ; end ; POKEFANM (10) db "DEREK@", TRAINERTYPE_ITEM - db 19, PIKACHU, BERRY + db 19, PIKACHU, BERRY db -1 ; end ; POKEFANM (11) db "DEREK@", TRAINERTYPE_ITEM - db 36, PIKACHU, BERRY + db 36, PIKACHU, BERRY db -1 ; end ; POKEFANM (12) db "ALEX@", TRAINERTYPE_ITEM - db 29, NIDOKING, BERRY - db 29, SLOWKING, BERRY - db 29, SEAKING, BERRY + db 29, NIDOKING, BERRY + db 29, SLOWKING, BERRY + db 29, SEAKING, BERRY db -1 ; end ; POKEFANM (13) db "REX@", TRAINERTYPE_ITEM - db 35, PHANPY, BERRY + db 35, PHANPY, BERRY db -1 ; end ; POKEFANM (14) db "ALLAN@", TRAINERTYPE_ITEM - db 35, TEDDIURSA, BERRY + db 35, TEDDIURSA, BERRY db -1 ; end ; ================================ @@ -3516,14 +3516,14 @@ TwinsGroup: ; TWINS (2) db "ANN & ANNE@", TRAINERTYPE_MOVES - db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME + db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE db -1 ; end ; TWINS (3) db "ANN & ANNE@", TRAINERTYPE_MOVES db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE - db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME + db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME db -1 ; end ; TWINS (4) @@ -3558,14 +3558,14 @@ TwinsGroup: ; TWINS (9) db "LEA & PIA@", TRAINERTYPE_MOVES - db 35, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT - db 35, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 35, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT + db 35, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT db -1 ; end ; TWINS (10) db "LEA & PIA@", TRAINERTYPE_MOVES - db 38, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT - db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT + db 38, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db -1 ; end ; ================================ @@ -3574,36 +3574,36 @@ PokefanFGroup: ; ================================ ; POKEFANF (1) db "BEVERLY@", TRAINERTYPE_ITEM - db 14, SNUBBULL, BERRY + db 14, SNUBBULL, BERRY db -1 ; end ; POKEFANF (2) db "RUTH@", TRAINERTYPE_ITEM - db 17, PIKACHU, BERRY + db 17, PIKACHU, BERRY db -1 ; end ; POKEFANF (3) db "BEVERLY@", TRAINERTYPE_ITEM - db 18, SNUBBULL, BERRY + db 18, SNUBBULL, BERRY db -1 ; end ; POKEFANF (4) db "BEVERLY@", TRAINERTYPE_ITEM - db 30, GRANBULL, BERRY + db 30, GRANBULL, BERRY db -1 ; end ; POKEFANF (5) db "GEORGIA@", TRAINERTYPE_ITEM - db 23, SENTRET, BERRY - db 23, SENTRET, BERRY - db 23, SENTRET, BERRY - db 28, FURRET, BERRY - db 23, SENTRET, BERRY + db 23, SENTRET, BERRY + db 23, SENTRET, BERRY + db 23, SENTRET, BERRY + db 28, FURRET, BERRY + db 23, SENTRET, BERRY db -1 ; end ; POKEFANF (6) db "JAIME@", TRAINERTYPE_ITEM - db 16, MEOWTH, BERRY + db 16, MEOWTH, BERRY db -1 ; end ; ================================ @@ -3612,12 +3612,12 @@ RedGroup: ; ================================ ; RED (1) db "RED@", TRAINERTYPE_MOVES - db 81, PIKACHU, CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER - db 73, ESPEON, MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M - db 75, SNORLAX, AMNESIA, SNORE, REST, BODY_SLAM - db 77, VENUSAUR, SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM - db 77, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN - db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL + db 81, PIKACHU, CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER + db 73, ESPEON, MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M + db 75, SNORLAX, AMNESIA, SNORE, REST, BODY_SLAM + db 77, VENUSAUR, SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM + db 77, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN + db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL db -1 ; end ; ================================ @@ -3626,12 +3626,12 @@ BlueGroup: ; ================================ ; BLUE (1) db "BLUE@", TRAINERTYPE_MOVES - db 56, PIDGEOT, QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE - db 54, ALAKAZAM, DISABLE, RECOVER, PSYCHIC_M, REFLECT - db 56, RHYDON, FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE - db 58, GYARADOS, TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM - db 58, EXEGGUTOR, SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM - db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED + db 56, PIDGEOT, QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE + db 54, ALAKAZAM, DISABLE, RECOVER, PSYCHIC_M, REFLECT + db 56, RHYDON, FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE + db 58, GYARADOS, TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM + db 58, EXEGGUTOR, SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM + db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED db -1 ; end ; ================================ @@ -3655,7 +3655,7 @@ GruntFGroup: ; ================================ ; GRUNTF (1) db "GRUNT@", TRAINERTYPE_NORMAL - db 9, ZUBAT + db 9, ZUBAT db 11, EKANS db -1 ; end @@ -3680,8 +3680,8 @@ GruntFGroup: ; GRUNTF (5) db "GRUNT@", TRAINERTYPE_MOVES - db 18, EKANS, WRAP, LEER, POISON_STING, BITE - db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER + db 18, EKANS, WRAP, LEER, POISON_STING, BITE + db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER db -1 ; end ; ================================ @@ -3690,8 +3690,8 @@ MysticalmanGroup: ; ================================ ; MYSTICALMAN (1) db "EUSINE@", TRAINERTYPE_MOVES - db 23, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION - db 23, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE - db 25, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT + db 23, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION + db 23, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE + db 25, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT db -1 ; end ; ================================