diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 0ba8eb793..026c280f8 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -555,8 +555,6 @@ DEF KRIS EQU __trainer_class__ trainerclass FIREBREATHER ; 30 const OTIS - const DICK - const NED const BURT const BILL const WALT1 @@ -573,14 +571,12 @@ DEF KRIS EQU __trainer_class__ const HORTON trainerclass BLACKBELT_T ; 32 - const KENJI1 const YOSHI - const KENJI2 const LAO const NOB const KIYO const LUNG - const KENJI3 + const KENJI const WAI const MANFORD const ANDER diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index e38f8d3e2..2e560175e 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -45,7 +45,7 @@ PhoneContacts: phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneCalleeScript, ANYTIME, TiffanyPhoneCallerScript phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneCalleeScript, ANYTIME, VancePhoneCallerScript phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneCalleeScript, ANYTIME, WiltonPhoneCallerScript - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneCalleeScript, ANYTIME, KenjiPhoneCallerScript + phone BLACKBELT_T, KENJI, ROUTE_45, ANYTIME, KenjiPhoneCalleeScript, ANYTIME, KenjiPhoneCallerScript phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneCalleeScript, ANYTIME, ParryPhoneCallerScript phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneCalleeScript, ANYTIME, ErinPhoneCallerScript phone BUG_CATCHER, DOUG1, ROUTE_2_SOUTH, ANYTIME, DougPhoneCalleeScript, ANYTIME, DougPhoneCallerScript diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 0a861af76..139c4e890 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -18,14 +18,14 @@ FalknerGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE - db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE + db 9, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE + db 13, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE db $fe ; delimiter ;Challenge Mode db TRAINERTYPE_MOVES - db 11, PIDGEY, TACKLE, MUD_SLAP, GUST, NO_MOVE - db 14, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, QUICK_ATTACK + db 11, PIDGEY, TACKLE, MUD_SLAP, GUST, NO_MOVE + db 14, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, QUICK_ATTACK db -1 ; end @@ -52,9 +52,9 @@ BugsyGroup: ;Normal Mode db 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 15, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE + db 15, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE + db 17, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE db $fe ; delimiter ;Challenge Mode @@ -92,9 +92,9 @@ PryceGroup: ;Normal Mode db 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 30, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 32, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 34, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db $fe ; delimiter ;Challenge Mode @@ -132,8 +132,8 @@ ChuckGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES - db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH + db 29, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES + db 31, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db $fe ; delimiter ;Challenge Mode @@ -149,10 +149,10 @@ ClairGroup: ;Normal Mode db 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 38, GYARADOS, SURF, BITE, SCARY_FACE, DRAGONBREATH + db 38, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH + db 38, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH + db 41, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db $fe ; delimiter ;Challenge Mode @@ -185,9 +185,9 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_NORMAL - db 12, GASTLY - db 14, ZUBAT - db 16, BAYLEEF + db 14, GASTLY + db 16, ZUBAT + db 18, BAYLEEF db $fe ; delimiter ;Challenge Mode @@ -202,9 +202,9 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_NORMAL - db 12, GASTLY - db 14, ZUBAT - db 16, QUILAVA + db 14, GASTLY + db 16, ZUBAT + db 18, QUILAVA db $fe ; delimiter ;Challenge Mode @@ -219,9 +219,9 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_NORMAL - db 12, GASTLY - db 14, ZUBAT - db 16, CROCONAW + db 14, GASTLY + db 16, ZUBAT + db 18, CROCONAW db $fe ; delimiter ;Challenge Mode @@ -314,11 +314,11 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_MOVES - db 30, GOLBAT, SWIFT, BITE, CONFUSE_RAY, WING_ATTACK - db 28, MAGNEMITE, SPARK, SUPERSONIC, SONICBOOM, THUNDER_WAVE - db 30, HAUNTER, NIGHT_SHADE, MEAN_LOOK, CURSE, SHADOW_BALL - db 32, SNEASEL, FURY_SWIPES, ICY_WIND, SCREECH, FEINT_ATTACK - db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL + db 32, GOLBAT, SWIFT, BITE, CONFUSE_RAY, WING_ATTACK + db 30, MAGNEMITE, SPARK, SUPERSONIC, SONICBOOM, THUNDER_WAVE + db 32, HAUNTER, NIGHT_SHADE, MEAN_LOOK, CURSE, SHADOW_BALL + db 34, SNEASEL, FURY_SWIPES, ICY_WIND, SCREECH, FEINT_ATTACK + db 34, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db $fe ; delimiter ;Challenge Mode @@ -356,12 +356,12 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_MOVES - db 34, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 35, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT - db 38, MEGANIUM, REFLECT, PETAL_DANCE, SYNTHESIS, BODY_SLAM + db 36, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER + db 38, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 37, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 37, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 37, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 40, MEGANIUM, REFLECT, PETAL_DANCE, SYNTHESIS, BODY_SLAM db $fe ; delimiter ;Challenge Mode @@ -379,12 +379,12 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_MOVES - db 34, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 35, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT - db 38, TYPHLOSION, SWIFT, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL + db 36, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER + db 38, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 37, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 37, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 37, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 40, TYPHLOSION, SWIFT, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL db $fe ; delimiter ;Challenge Mode @@ -402,12 +402,12 @@ Rival1Group: ;Normal Mode db TRAINERTYPE_MOVES - db 34, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER - db 36, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 34, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT - db 38, FERALIGATR, CRUNCH, WATER_GUN, SCARY_FACE, SLASH + db 36, SNEASEL, ICY_WIND, SCREECH, FEINT_ATTACK, FURY_CUTTER + db 38, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 36, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 37, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 37, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 40, FERALIGATR, CRUNCH, WATER_GUN, SCARY_FACE, SLASH db $fe ; delimiter ;Challenge Mode @@ -541,11 +541,11 @@ ChampionGroup: ;Normal Mode db 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 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM - db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM + db 46, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM + db 49, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM + db 49, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM + db 48, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM + db 48, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db $fe ; delimiter @@ -1192,7 +1192,7 @@ SchoolboyGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 19, MR__MIME + db 20, MR__MIME db $fe ; delimiter ;Challenge Mode @@ -1615,9 +1615,9 @@ BirdKeeperGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 15, DODUO db 16, DODUO db 17, DODUO + db 18, DODUO db $fe ; delimiter ;Challenge Mode @@ -1649,8 +1649,8 @@ BirdKeeperGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 25, PIDGEOTTO - db 25, PIDGEOTTO + db 28, PIDGEOTTO + db 28, PIDGEOTTO db $fe ; delimiter ;Challenge Mode @@ -2129,8 +2129,8 @@ LassGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 19, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 19, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION db $fe ; delimiter ;Challenge Mode @@ -2338,9 +2338,9 @@ CooltrainerMGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 34, DRATINI - db 34, DRATINI - db 34, DRATINI + db 35, DRATINI + db 35, SEADRA + db 35, DRATINI db $fe ; delimiter ;Challenge Mode @@ -2355,8 +2355,8 @@ CooltrainerMGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 34, HORSEA - db 36, SEADRA + db 35, HORSEA + db 37, SEADRA db $fe ; delimiter ;Challenge Mode @@ -2370,7 +2370,7 @@ CooltrainerMGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 37, DRAGONAIR + db 38, DRAGONAIR db $fe ; delimiter ;Challenge Mode @@ -2481,7 +2481,7 @@ CooltrainerMGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT + db 35, SANDSLASH, SAND_ATTACK, POISON_STING, RAPID_SPIN, DIG db $fe ; delimiter ;Challenge Mode @@ -2528,7 +2528,8 @@ CooltrainerMGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 27, CHARMELEON, EMBER, SMOKESCREEN, RAGE, SCARY_FACE + db 29, CHARMELEON, EMBER, SMOKESCREEN, RAGE, SCARY_FACE + db 29, MAGNEMITE, SPARK, SWIFT, THUNDER_WAVE, SUPERSONIC db $fe ; delimiter ;Challenge Mode @@ -2621,13 +2622,13 @@ CooltrainerFGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED + db 25, MAREEP, THUNDERSHOCK, TAKE_DOWN, THUNDER_WAVE, CONFUSE_RAY db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD db $fe ; delimiter ;Challenge Mode db TRAINERTYPE_MOVES - db 32, FLAAFFY, SPARK, TAKE_DOWN, THUNDER_WAVE, CONFUSE_RAY + db 32, FLAAFFY, SPARK, TAKE_DOWN, THUNDER_WAVE, CONFUSE_RAY db 32, NINETALES, FLAMETHROWER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD db -1 ; end @@ -2636,7 +2637,7 @@ CooltrainerFGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 37, SEADRA + db 38, SEADRA db $fe ; delimiter ;Challenge Mode @@ -2649,8 +2650,8 @@ CooltrainerFGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 34, DRATINI - db 36, DRAGONAIR + db 35, DRATINI + db 37, DRAGONAIR db $fe ; delimiter ;Challenge Mode @@ -2835,8 +2836,8 @@ CooltrainerFGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST - db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM + db 29, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST + db 29, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM db $fe ; delimiter ;Challenge Mode @@ -2951,7 +2952,7 @@ BeautyGroup: db TRAINERTYPE_NORMAL db 9, SENTRET db 13, SENTRET - db 17, SENTRET + db 16, SENTRET db $fe ; delimiter ;Challenge Mode @@ -3013,8 +3014,8 @@ BeautyGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER - db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE + db 18, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER + db 18, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE db $fe ; delimiter ;Challenge Mode @@ -3084,8 +3085,8 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 16, NIDORINA - db 16, NIDORINO + db 17, NIDORINA + db 17, NIDORINO db $fe ; delimiter ;Challenge Mode @@ -3099,7 +3100,7 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 19, SLOWBRO + db 20, SLOWBRO db $fe ; delimiter ;Challenge Mode @@ -3112,7 +3113,7 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 19, LICKITUNG + db 20, LICKITUNG db $fe ; delimiter ;Challenge Mode @@ -3125,7 +3126,7 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 19, NIDOKING + db 20, NIDOKING db $fe ; delimiter ;Challenge Mode @@ -3138,8 +3139,8 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 31, RHYHORN - db 31, RHYDON + db 39, RHYHORN + db 39, RHYDON db $fe ; delimiter ;Challenge Mode @@ -3192,8 +3193,8 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 10, SLOWPOKE - db 10, SLOWPOKE + db 11, SLOWPOKE + db 11, SLOWPOKE db $fe ; delimiter ;Challenge Mode @@ -3207,7 +3208,7 @@ PokemaniacGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 27, RHYHORN + db 30, RHYHORN db $fe ; delimiter ;Challenge Mode @@ -3250,7 +3251,8 @@ GruntMGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 14, KOFFING + db 8, ZUBAT + db 12, KOFFING db $fe ; delimiter ;Challenge Mode @@ -3687,7 +3689,7 @@ GentlemanGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 20, NOCTOWL + db 22, NOCTOWL db $fe ; delimiter ;Challenge Mode @@ -3754,7 +3756,7 @@ SkierGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 28, JYNX + db 29, JYNX db $fe ; delimiter ;Challenge Mode @@ -3767,7 +3769,7 @@ SkierGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 28, DEWGONG + db 29, DEWGONG db $fe ; delimiter ;Challenge Mode @@ -4411,9 +4413,8 @@ FisherGroup: ;Normal Mode db TRAINERTYPE_NORMAL db 10, MAGIKARP - db 10, GYARADOS db 15, MAGIKARP - db 15, GYARADOS + db 20, GYARADOS db $fe ; delimiter ;Challenge Mode @@ -4428,7 +4429,7 @@ FisherGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 18, QWILFISH + db 19, QWILFISH db $fe ; delimiter ;Challenge Mode @@ -4473,9 +4474,9 @@ FisherGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 23, GOLDEEN - db 23, GOLDEEN - db 25, SEAKING + db 26, GOLDEEN + db 26, GOLDEEN + db 28, SEAKING db $fe ; delimiter ;Challenge Mode @@ -4490,8 +4491,8 @@ FisherGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM - db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 28, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 28, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM db $fe ; delimiter ;Challenge Mode @@ -5357,7 +5358,7 @@ SailorGroup: ;Normal Mode db TRAINERTYPE_NORMAL db 18, POLIWAG - db 18, POLIWHIRL + db 20, POLIWHIRL db $fe ; delimiter ;Challenge Mode @@ -5480,7 +5481,7 @@ SailorGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 19, WOOPER + db 20, WOOPER db $fe ; delimiter ;Challenge Mode @@ -5731,12 +5732,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 41, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M - db 45, MEGANIUM, RAZOR_LEAF, BODY_SLAM, LIGHT_SCREEN, SYNTHESIS + db 46, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER + db 47, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 46, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 48, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 50, MEGANIUM, RAZOR_LEAF, BODY_SLAM, LIGHT_SCREEN, SYNTHESIS db $fe ; delimiter ;Challenge Mode @@ -5754,12 +5755,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 41, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M - db 45, TYPHLOSION, SMOKESCREEN, ROLLOUT, FLAME_WHEEL, SWIFT + db 46, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER + db 47, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 46, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 48, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 50, TYPHLOSION, SMOKESCREEN, ROLLOUT, FLAME_WHEEL, SWIFT db $fe ; delimiter ;Challenge Mode @@ -5777,12 +5778,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 41, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER - db 42, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK - db 41, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M - db 45, FERALIGATR, CRUNCH, WATER_GUN, SCREECH, SLASH + db 46, SNEASEL, ICY_WIND, METAL_CLAW, FEINT_ATTACK, FURY_CUTTER + db 47, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 46, MAGNETON, SPARK, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 48, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 50, FERALIGATR, CRUNCH, WATER_GUN, SCREECH, SLASH db $fe ; delimiter ;Challenge Mode @@ -5800,12 +5801,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 46, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER - db 47, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 46, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT - db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD + db 55, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER + db 58, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 55, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 56, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 56, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 60, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD db $fe ; delimiter ;Challenge Mode @@ -5823,12 +5824,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 46, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER - db 47, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 46, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT - db 50, TYPHLOSION, SMOKESCREEN, ROLLOUT, FIRE_BLAST, SWIFT + db 55, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER + db 58, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 55, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 56, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 56, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 60, TYPHLOSION, SMOKESCREEN, ROLLOUT, FIRE_BLAST, SWIFT db $fe ; delimiter ;Challenge Mode @@ -5846,12 +5847,12 @@ Rival2Group: ;Normal Mode db TRAINERTYPE_MOVES - db 46, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER - db 47, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK - db 46, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK - db 48, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY - db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT - db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, CRUNCH + db 55, SNEASEL, ICY_WIND, METAL_CLAW, BEAT_UP, FURY_CUTTER + db 58, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 55, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, TRI_ATTACK + db 56, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 56, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 60, FERALIGATR, SURF, RAIN_DANCE, SLASH, CRUNCH db $fe ; delimiter ;Challenge Mode @@ -5936,8 +5937,7 @@ HikerGroup: ;Normal Mode db TRAINERTYPE_NORMAL db 23, GEODUDE - db 23, GEODUDE - db 23, GRAVELER + db 25, GRAVELER db $fe ; delimiter ;Challenge Mode @@ -5981,9 +5981,9 @@ HikerGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 14, DIGLETT - db 14, GEODUDE - db 16, DUGTRIO + db 15, DIGLETT + db 15, GEODUDE + db 17, DUGTRIO db $fe ; delimiter ;Challenge Mode @@ -6207,7 +6207,7 @@ HikerGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 29, ONIX + db 30, ONIX db $fe ; delimiter ;Challenge Mode @@ -6756,36 +6756,6 @@ FirebreatherGroup: db 59, MAGMAR db -1 ; end - ; FIREBREATHER (2) - db "DICK@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db TRAINERTYPE_NORMAL - db 17, CHARMELEON - db $fe ; delimiter - - ;Challenge Mode - db TRAINERTYPE_NORMAL - db 22, CHARMELEON - db -1 ; end - - ; FIREBREATHER (3) - db "NED@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db TRAINERTYPE_NORMAL - db 15, KOFFING - db 16, GROWLITHE - db 15, KOFFING - db $fe ; delimiter - - ;Challenge Mode - db TRAINERTYPE_NORMAL - db 20, KOFFING - db 21, GROWLITHE - db 20, KOFFING - db -1 ; end - ; FIREBREATHER (4) db "BURT@", TRAINERTYPE_VARIABLE @@ -6981,25 +6951,6 @@ JugglerGroup: BlackbeltGroup: ; BLACKBELT_T (1) - db "KENJI@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db TRAINERTYPE_NORMAL - db 27, ONIX - db 30, HITMONLEE - db 27, ONIX - db 32, MACHOKE - db $fe ; delimiter - - ;Challenge Mode - db TRAINERTYPE_NORMAL - db 27, ONIX - db 30, HITMONLEE - db 27, ONIX - db 32, MACHOKE - db -1 ; end - - ; BLACKBELT_T (2) db "YOSHI@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7012,26 +6963,7 @@ BlackbeltGroup: db 31, HITMONLEE, DOUBLE_KICK, MEDITATE, HI_JUMP_KICK, FOCUS_ENERGY db -1 ; end - ; BLACKBELT_T (3) - db "KENJI@", TRAINERTYPE_VARIABLE - - ;Normal Mode - db 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 $fe ; delimiter - - ;Challenge Mode - db 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 -1 ; end - - ; BLACKBELT_T (4) + ; BLACKBELT_T (2) db "LAO@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7044,7 +6976,7 @@ BlackbeltGroup: db 31, HITMONCHAN, MACH_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH db -1 ; end - ; BLACKBELT_T (5) + ; BLACKBELT_T (3) db "NOB@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7059,7 +6991,7 @@ BlackbeltGroup: db 29, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE db -1 ; end - ; BLACKBELT_T (6) + ; BLACKBELT_T (4) db "KIYO@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7074,7 +7006,7 @@ BlackbeltGroup: db 45, HITMONCHAN db -1 ; end - ; BLACKBELT_T (7) + ; BLACKBELT_T (5) db "LUNG@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7091,7 +7023,7 @@ BlackbeltGroup: db 29, PRIMEAPE db -1 ; end - ; BLACKBELT_T (8) + ; BLACKBELT_T (6) db "KENJI@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7104,7 +7036,7 @@ BlackbeltGroup: db 38, MACHOKE db -1 ; end - ; BLACKBELT_T (9) + ; BLACKBELT_T (7) db "WAI@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7121,7 +7053,7 @@ BlackbeltGroup: db 54, MACHOKE db -1 ; end - ; BLACKBELT_T (10) + ; BLACKBELT_T (8) db "MANFORD@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7134,7 +7066,7 @@ BlackbeltGroup: db 59, POLIWRATH db -1 ; end - ; BLACKBELT_T (11) + ; BLACKBELT_T (9) db "ANDER@", TRAINERTYPE_VARIABLE ;Normal Mode @@ -7158,9 +7090,9 @@ ExecutiveMGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 33, HOUNDOUR, EMBER, ROAR, BITE, FEINT_ATTACK - db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE - db 35, HOUNDOOM, EMBER, SMOG, BITE, FEINT_ATTACK + db 35, HOUNDOUR, EMBER, ROAR, BITE, FEINT_ATTACK + db 35, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE + db 38, HOUNDOOM, EMBER, SMOG, BITE, FEINT_ATTACK db $fe ; delimiter ;Challenge Mode @@ -7175,7 +7107,8 @@ ExecutiveMGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 36, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 28, GOLBAT, SWIFT, CRUNCH, CONFUSE_RAY, WING_ATTACK + db 33, WEEZING, SLUDGE, TOXIC, FEINT_ATTACK, SMOKESCREEN db $fe ; delimiter ;Challenge Mode @@ -7317,9 +7250,9 @@ PsychicGroup: ;Normal Mode db 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 14, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 14, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 16, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE db $fe ; delimiter ;Challenge Mode @@ -7334,8 +7267,8 @@ PsychicGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY - db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 27, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY + db 29, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT db $fe ; delimiter ;Challenge Mode @@ -7690,7 +7623,7 @@ PicnickerGroup: ;Normal Mode db TRAINERTYPE_MOVES - db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE + db 21, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE db $fe ; delimiter ;Challenge Mode @@ -8030,9 +7963,9 @@ CamperGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 17, SANDSHREW - db 17, SANDSLASH - db 19, ZUBAT + db 18, SANDSHREW + db 18, SANDSLASH + db 20, ZUBAT db $fe ; delimiter ;Challenge Mode @@ -8206,9 +8139,9 @@ ExecutiveFGroup: ;Normal Mode db 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 25, ARBOK, WRAP, LEER, POISON_STING, BITE + db 25, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 27, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE db $fe ; delimiter ;Challenge Mode @@ -8479,9 +8412,9 @@ BoarderGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 24, SEEL - db 25, DEWGONG - db 24, SEEL + db 25, SEEL + db 26, DEWGONG + db 25, SEEL db $fe ; delimiter ;Challenge Mode @@ -8496,8 +8429,8 @@ BoarderGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 26, SWINUB - db 26, SWINUB + db 27, SWINUB + db 27, SWINUB db $fe ; delimiter ;Challenge Mode @@ -8511,9 +8444,9 @@ BoarderGroup: ;Normal Mode db TRAINERTYPE_NORMAL - db 24, SHELLDER - db 25, CLOYSTER - db 24, SHELLDER + db 25, SHELLDER + db 26, CLOYSTER + db 25, SHELLDER db $fe ; delimiter ;Challenge Mode @@ -8560,7 +8493,7 @@ PokefanMGroup: ;Normal Mode db TRAINERTYPE_ITEM - db 14, RAICHU, ORAN_BERRY + db 16, RAICHU, ORAN_BERRY db $fe ; delimiter ;Challenge Mode @@ -8573,7 +8506,7 @@ PokefanMGroup: ;Normal Mode db TRAINERTYPE_ITEM - db 17, PIKACHU, ORAN_BERRY + db 18, PIKACHU, ORAN_BERRY db $fe ; delimiter ;Challenge Mode @@ -8653,6 +8586,7 @@ PokefanMGroup: ;Normal Mode db TRAINERTYPE_ITEM db 13, SNUBBULL, ORAN_BERRY + db 13, MAREEP, ORAN_BERRY db $fe ; delimiter ;Challenge Mode @@ -9024,7 +8958,7 @@ PokefanFGroup: ;Normal Mode db TRAINERTYPE_ITEM - db 14, SNUBBULL, ORAN_BERRY + db 16, SNUBBULL, ORAN_BERRY db $fe ; delimiter ;Challenge Mode @@ -9260,9 +9194,9 @@ MysticalmanGroup: ;Normal Mode db 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 25, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION + db 25, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE + db 27, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT db $fe ; delimiter ;Challenge Mode diff --git a/engine/phone/scripts/kenji.asm b/engine/phone/scripts/kenji.asm index 807510df4..1c5cad4db 100644 --- a/engine/phone/scripts/kenji.asm +++ b/engine/phone/scripts/kenji.asm @@ -1,9 +1,9 @@ KenjiPhoneCalleeScript: - gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI farscall PhoneScript_AnswerPhone_Male farsjump KenjiAnswerPhoneScript KenjiPhoneCallerScript: - gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI farscall PhoneScript_GreetPhone_Male farsjump KenjiCallingPhoneScript diff --git a/maps/Route45.asm b/maps/Route45.asm index 8af23bda9..9d48d40f5 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -36,7 +36,7 @@ Route45Fruittrees: endcallback TrainerBlackbeltKenji: - trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script + trainer BLACKBELT_T, KENJI, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script .Script: loadvar VAR_CALLERID, PHONE_BLACKBELT_KENJI @@ -58,7 +58,7 @@ TrainerBlackbeltKenji: askforphonenumber PHONE_BLACKBELT_KENJI ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM - gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 + gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI scall Route45RegisteredNumberM sjump Route45NumberAcceptedM