diff options
Diffstat (limited to 'data/trainers')
| -rw-r--r-- | data/trainers/move_choices.asm | 8 | ||||
| -rw-r--r-- | data/trainers/parties.asm | 123 | ||||
| -rw-r--r-- | data/trainers/special_moves.asm | 183 |
3 files changed, 224 insertions, 90 deletions
diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 2c3498af..d80722b1 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -28,7 +28,7 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; GAMBLER move_choices 1, 3 ; BEAUTY move_choices 1, 2 ; PSYCHIC_TR - move_choices 1, 3 ; ROCKER + move_choices 1 ; ROCKER move_choices 1 ; JUGGLER move_choices 1 ; TAMER move_choices 1 ; BIRD_KEEPER @@ -44,11 +44,11 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; BRUNO move_choices 1 ; BROCK move_choices 1, 3 ; MISTY - move_choices 1, 3 ; LT_SURGE + move_choices 1 ; LT_SURGE move_choices 1, 3 ; ERIKA move_choices 1, 3 ; KOGA - move_choices 1, 3 ; BLAINE - move_choices 1, 3 ; SABRINA + move_choices 1 ; BLAINE + move_choices 1 ; SABRINA move_choices 1, 2 ; GENTLEMAN move_choices 1, 3 ; RIVAL2 move_choices 1, 3 ; RIVAL3 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index dddcf653..46bbf721 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -23,7 +23,7 @@ TrainerDataPointers: dw TamerData dw BirdKeeperData dw BlackbeltData - dw Green1Data + dw Rival1Data dw ProfOakData dw ChiefData dw ScientistData @@ -40,8 +40,8 @@ TrainerDataPointers: dw BlaineData dw SabrinaData dw GentlemanData - dw Green2Data - dw Green3Data + dw Rival2Data + dw Rival3Data dw LoreleiData dw ChannelerData dw AgathaData @@ -77,12 +77,13 @@ YoungsterData: db 18, NIDORAN_M, NIDORINO, 0 ; Unused db 17, SPEAROW, RATTATA, RATTATA, SPEAROW, 0 + db 24, SANDSHREW, 0 BugCatcherData: ; Viridian Forest - db 6, WEEDLE, CATERPIE, 0 - db 7, WEEDLE, KAKUNA, WEEDLE, 0 - db 9, WEEDLE, 0 + db 7, CATERPIE, CATERPIE, 0 + db 6, METAPOD, CATERPIE, METAPOD, 0 + db 10, CATERPIE, 0 ; Route 3 db 10, CATERPIE, WEEDLE, CATERPIE, 0 db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0 @@ -100,6 +101,7 @@ BugCatcherData: ; Route 9 db 19, BEEDRILL, BEEDRILL, 0 db 20, CATERPIE, WEEDLE, VENONAT, 0 + db 8, CATERPIE, METAPOD, 0 LassData: ; Route 3 @@ -120,15 +122,16 @@ LassData: ; SS Anne 1F Rooms db 18, PIDGEY, NIDORAN_F, 0 ; SS Anne 2F Rooms - db 18, RATTATA, PIKACHU, 0 + db 20, JIGGLYPUFF, 0 ; Route 8 db 23, NIDORAN_F, NIDORINA, 0 db 24, MEOWTH, MEOWTH, MEOWTH, 0 - db 19, PIDGEY, RATTATA, NIDORAN_M, MEOWTH, PIKACHU, 0 + db 19, PIDGEY, RATTATA, NIDORAN_F, MEOWTH, NIDORAN_M, 0 db 22, CLEFAIRY, CLEFAIRY, 0 ; Celadon Gym db 23, BELLSPROUT, WEEPINBELL, 0 db 23, ODDISH, GLOOM, 0 + db 6, NIDORAN_F, NIDORAN_M, 0 SailorData: ; SS Anne Stern @@ -141,11 +144,11 @@ SailorData: db 17, HORSEA, HORSEA, HORSEA, 0 db 20, MACHOP, 0 ; Vermilion Gym - db 21, PIKACHU, PIKACHU, 0 + db 24, MAGNEMITE, 0 JrTrainerMData: ; Pewter Gym - db 11, DIGLETT, SANDSHREW, 0 + db 9, DIGLETT, SANDSHREW, 0 ; Route 24/Route 25 db 14, RATTATA, EKANS, 0 ; Route 24 @@ -160,12 +163,13 @@ JrTrainerMData: db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0 ; Route 12 db 29, NIDORAN_M, NIDORINO, 0 + db 16, WEEPINBELL, 0 JrTrainerFData: ; Cerulean Gym db 19, GOLDEEN, 0 ; Route 6 - db 16, RATTATA, PIKACHU, 0 + db 16, ODDISH, BELLSPROUT, 0 db 16, PIDGEY, PIDGEY, PIDGEY, 0 ; Unused db 22, BULBASAUR, 0 @@ -173,7 +177,7 @@ JrTrainerFData: db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 db 23, MEOWTH, 0 ; Route 10 - db 20, PIKACHU, CLEFAIRY, 0 + db 20, JIGGLYPUFF, CLEFAIRY, 0 db 21, PIDGEY, PIDGEOTTO, 0 ; Rock Tunnel B1F db 21, JIGGLYPUFF, PIDGEY, MEOWTH, 0 @@ -181,7 +185,7 @@ JrTrainerFData: ; Celadon Gym db 24, BULBASAUR, IVYSAUR, 0 ; Route 13 - db 24, PIDGEY, MEOWTH, RATTATA, PIKACHU, MEOWTH, 0 + db 24, PIDGEY, MEOWTH, RATTATA, PIDGEY, MEOWTH, 0 db 30, POLIWAG, POLIWAG, 0 db 27, PIDGEY, MEOWTH, PIDGEY, PIDGEOTTO, 0 db 28, GOLDEEN, POLIWAG, HORSEA, 0 @@ -193,11 +197,12 @@ JrTrainerFData: db 19, PIDGEY, RATTATA, RATTATA, BELLSPROUT, 0 ; Route 15 db 28, GLOOM, ODDISH, ODDISH, 0 - db 29, PIKACHU, RAICHU, 0 + db 29, PIDGEY, PIDGEOTTO, 0 db 33, CLEFAIRY, 0 db 29, BELLSPROUT, ODDISH, TANGELA, 0 ; Route 20 db 30, TENTACOOL, HORSEA, SEEL, 0 + db 20, CUBONE, 0 PokemaniacData: ; Route 10 @@ -267,14 +272,6 @@ BikerData: db 33, WEEZING, 0 db 26, GRIMER, GRIMER, GRIMER, GRIMER, 0 ; Route 17 - ; From https://www.smogon.com/smog/issue27/glitch: - ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. - ; BaseStats + (BASE_DATA_SIZE) * (000 - 1) = $5FC2; - ; that's the formula from GetMonHeader for the base stats of mon #000. - ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) - ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. - ; The result is that this data gets interpreted as the base stats - ; for MissingNo: 0, 33, MUK, 0, 29, VOLTORB, VOLTORB, 0, ..., 28, GRIMER, GRIMER. db 28, WEEZING, KOFFING, WEEZING, 0 db 33, MUK, 0 db 29, VOLTORB, VOLTORB, 0 @@ -383,7 +380,7 @@ BeautyData: db 24, BELLSPROUT, BELLSPROUT, 0 db 26, EXEGGCUTE, 0 ; Route 13 - db 27, RATTATA, PIKACHU, RATTATA, 0 + db 27, RATTATA, VULPIX, RATTATA, 0 db 29, CLEFAIRY, MEOWTH, 0 ; Route 20 db 35, SEAKING, 0 @@ -410,7 +407,7 @@ PsychicData: RockerData: ; Vermilion Gym - db 20, VOLTORB, MAGNEMITE, VOLTORB, 0 + db 20, VOLTORB, VOLTORB, VOLTORB, 0 ; Route 12 db 29, VOLTORB, ELECTRODE, 0 @@ -482,18 +479,12 @@ BlackbeltData: ; Victory Road 2F db 43, MACHOKE, MACHOP, MACHOKE, 0 -Green1Data: - db 5, SQUIRTLE, 0 - db 5, BULBASAUR, 0 - db 5, CHARMANDER, 0 +Rival1Data: + db 5, EEVEE, 0 ; Route 22 - db $FF, 9, PIDGEY, 8, SQUIRTLE, 0 - db $FF, 9, PIDGEY, 8, BULBASAUR, 0 - db $FF, 9, PIDGEY, 8, CHARMANDER, 0 + db $FF, 9, SPEAROW, 8, EEVEE, 0 ; Cerulean City - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, SQUIRTLE, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, BULBASAUR, 0 - db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMANDER, 0 + db $FF, 18, SPEAROW, 15, SANDSHREW, 15, RATTATA, 17, EEVEE, 0 ProfOakData: ; Unused @@ -533,11 +524,11 @@ ScientistData: GiovanniData: ; Rocket Hideout B4F - db $FF, 25, ONIX, 24, RHYHORN, 29, KANGASKHAN, 0 + db $FF, 25, ONIX, 24, RHYHORN, 29, PERSIAN, 0 ; Silph Co. 11F - db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0 + db $FF, 37, NIDORINO, 35, PERSIAN, 37, RHYHORN, 41, NIDOQUEEN, 0 ; Viridian Gym - db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0 + db $FF, 50, DUGTRIO, 53, PERSIAN, 53, NIDOQUEEN, 55, NIDOKING, 55, RHYDON, 0 RocketData: ; Mt. Moon B2F @@ -601,6 +592,16 @@ RocketData: ; Silph Co. 11F db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0 db 32, CUBONE, DROWZEE, MAROWAK, 0 +; Jessie & James + db 14, EKANS, MEOWTH, KOFFING, 0 + db 25, KOFFING, MEOWTH, EKANS, 0 + db 27, MEOWTH, ARBOK, WEEZING, 0 + db 31, WEEZING, ARBOK, MEOWTH, 0 +; Unused + db 16, KOFFING, 0 + db 27, KOFFING, 0 + db 29, WEEZING, 0 + db 33, WEEZING, 0 CooltrainerMData: ; Viridian Gym @@ -639,59 +640,57 @@ BrunoData: db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0 BrockData: - db $FF, 12, GEODUDE, 14, ONIX, 0 + db $FF, 10, GEODUDE, 12, ONIX, 0 MistyData: db $FF, 18, STARYU, 21, STARMIE, 0 LtSurgeData: - db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0 + db $FF, 28, RAICHU, 0 ErikaData: - db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0 + db $FF, 30, TANGELA, 32, WEEPINBELL, 32, GLOOM, 0 KogaData: - db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0 + db $FF, 44, VENONAT, 46, VENONAT, 48, VENONAT, 50, VENOMOTH, 0 BlaineData: - db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0 + db $FF, 48, NINETALES, 50, RAPIDASH, 54, ARCANINE, 0 SabrinaData: - db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0 + db $FF, 50, ABRA, 50, KADABRA, 50, ALAKAZAM, 0 GentlemanData: ; SS Anne 1F Rooms db 18, GROWLITHE, GROWLITHE, 0 db 19, NIDORAN_M, NIDORAN_F, 0 ; SS Anne 2F Rooms/Vermilion Gym - db 23, PIKACHU, 0 + db 22, VOLTORB, MAGNEMITE, 0 ; Unused db 48, PRIMEAPE, 0 ; SS Anne 2F Rooms db 17, GROWLITHE, PONYTA, 0 -Green2Data: +Rival2Data: ; SS Anne 2F - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0 - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0 - db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0 + db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, EEVEE, 0 ; Pokémon Tower 2F - db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0 - db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0 - db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0 + db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, EEVEE, 0 + db $FF, 25, FEAROW, 23, MAGNEMITE, 22, SHELLDER, 20, SANDSHREW, 25, EEVEE, 0 + db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNEMITE, 20, SANDSHREW, 25, EEVEE, 0 ; Silph Co. 7F - db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0 - db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 - db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 + db $FF, 38, SANDSLASH, 35, NINETALES, 37, CLOYSTER, 35, KADABRA, 40, JOLTEON, 0 + db $FF, 38, SANDSLASH, 35, CLOYSTER, 37, MAGNETON, 35, KADABRA, 40, FLAREON, 0 + db $FF, 38, SANDSLASH, 35, MAGNETON, 37, NINETALES, 35, KADABRA, 40, VAPOREON, 0 ; Route 22 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 - -Green3Data: - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0 - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, NINETALES, 47, CLOYSTER, 50, KADABRA, 53, JOLTEON, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, CLOYSTER, 47, MAGNETON, 50, KADABRA, 53, FLAREON, 0 + db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, MAGNETON, 47, NINETALES, 50, KADABRA, 53, VAPOREON, 0 + +Rival3Data: + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, JOLTEON, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNETON, 63, CLOYSTER, 65, FLAREON, 0 + db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNETON, 65, VAPOREON, 0 LoreleiData: db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index b797d1c7..d9c6b893 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1,25 +1,160 @@ -; unique moves for gym leaders -; this is not automatic! you have to write the index you want to [wLoneAttackNo] -; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, -; the fourth entry in the list. -LoneMoves: - ; pokemon index, move to give nth pokemon - db 1, BIDE - db 1, BUBBLEBEAM - db 2, THUNDERBOLT - db 2, MEGA_DRAIN - db 3, TOXIC - db 3, PSYWAVE - db 3, FIRE_BLAST - db 4, FISSURE - -; unique moves for elite 4 -; all trainers in this class are given this move automatically -; (unrelated to LoneMoves) -TeamMoves: - ; trainer, move - db LORELEI, BLIZZARD - db BRUNO, FISSURE - db AGATHA, TOXIC - db LANCE, BARRIER +; Yellow entry format: +; db trainerclass, trainerid +; repeat { db partymon location, partymon move, move id } +; db 0 + +SpecialTrainerMoves: + db BUG_CATCHER, 15 + db 2, 2, TACKLE + db 2, 3, STRING_SHOT + db 0 + + db YOUNGSTER, 14 + db 1, 4, FISSURE + db 0 + + db BROCK, 1 + db 2, 3, BIND + db 2, 4, BIDE + db 0 + + db MISTY, 1 + db 2, 4, BUBBLEBEAM + db 0 + + db LT_SURGE, 1 + db 1, 1, THUNDERBOLT + db 1, 2, MEGA_PUNCH + db 1, 3, MEGA_KICK + db 1, 4, GROWL + db 0 + + db ERIKA, 1 + db 1, 3, MEGA_DRAIN + db 2, 1, RAZOR_LEAF + db 3, 1, PETAL_DANCE + db 0 + + db KOGA, 1 + db 1, 1, TOXIC + db 1, 2, TACKLE + db 2, 1, TOXIC + db 2, 3, SUPERSONIC + db 3, 1, TOXIC + db 3, 2, DOUBLE_EDGE + db 4, 1, LEECH_LIFE + db 4, 2, DOUBLE_TEAM + db 4, 3, PSYCHIC_M + db 4, 4, TOXIC + db 0 + + db BLAINE, 1 + db 1, 1, FLAMETHROWER + db 1, 4, CONFUSE_RAY + db 3, 1, FLAMETHROWER + db 3, 2, FIRE_BLAST + db 3, 3, REFLECT + db 0 + + db SABRINA, 1 + db 1, 1, FLASH + db 2, 1, KINESIS + db 2, 4, PSYWAVE + db 3, 1, PSYWAVE + db 0 + + db GIOVANNI, 3 + db 1, 3, FISSURE + db 2, 2, DOUBLE_TEAM + db 3, 1, EARTHQUAKE + db 3, 3, THUNDER + db 4, 1, EARTHQUAKE + db 4, 2, LEER + db 4, 3, THUNDER + db 5, 1, ROCK_SLIDE + db 5, 4, EARTHQUAKE + db 0 + + db LORELEI, 1 + db 1, 1, BUBBLEBEAM + db 2, 3, ICE_BEAM + db 3, 1, PSYCHIC_M + db 3, 2, SURF + db 4, 3, LOVELY_KISS + db 5, 3, BLIZZARD + db 0 + + db BRUNO, 1 + db 1, 1, ROCK_SLIDE + db 1, 2, SCREECH + db 1, 4, DIG + db 2, 3, FIRE_PUNCH + db 2, 4, DOUBLE_TEAM + db 3, 1, DOUBLE_KICK + db 3, 2, MEGA_KICK + db 3, 4, DOUBLE_TEAM + db 4, 1, ROCK_SLIDE + db 4, 2, SCREECH + db 4, 4, EARTHQUAKE + db 5, 2, KARATE_CHOP + db 5, 3, STRENGTH + db 0 + + db AGATHA, 1 + db 1, 2, SUBSTITUTE + db 1, 3, LICK + db 1, 4, MEGA_DRAIN + db 2, 2, TOXIC + db 2, 4, LEECH_LIFE + db 3, 2, LICK + db 4, 1, WRAP + db 5, 2, PSYCHIC_M + db 0 + + db LANCE, 1 + db 1, 1, DRAGON_RAGE + db 2, 1, THUNDER_WAVE + db 2, 3, THUNDERBOLT + db 3, 1, BUBBLEBEAM + db 3, 2, WRAP + db 3, 3, ICE_BEAM + db 4, 1, WING_ATTACK + db 4, 2, SWIFT + db 4, 3, FLY + db 5, 1, BLIZZARD + db 5, 2, FIRE_BLAST + db 5, 3, THUNDER + db 0 + + db RIVAL3, 1 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, ICE_BEAM + db 5, 1, CONFUSE_RAY + db 5, 4, FIRE_SPIN + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL3, 2 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, THUNDERBOLT + db 5, 1, ICE_BEAM + db 6, 2, REFLECT + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL3, 3 + db 1, 3, EARTHQUAKE + db 2, 4, KINESIS + db 3, 4, LEECH_SEED + db 4, 1, CONFUSE_RAY + db 4, 4, FIRE_SPIN + db 5, 1, THUNDERBOLT + db 6, 1, AURORA_BEAM + db 6, 3, QUICK_ATTACK + db 0 + db -1 ; end |