diff options
| -rw-r--r-- | data/trainers/parties.asm | 115 |
1 files changed, 105 insertions, 10 deletions
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 94fd4a5..c264733 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -16,8 +16,21 @@ INCLUDE "data/trainers/party_pointers.inc" ; TODO: decode all data HayatoGroup:: +; Leftover Youngster data from Red/Blue + db 11, MON_KORATTA, MON_ARBO, 0 + db 14, MON_ONISUZUME, 0 + db 10, MON_KORATTA, MON_KORATTA, MON_ZUBAT, 0 + db 14, MON_KORATTA, MON_ARBO, MON_ZUBAT, 0 + db 15, MON_KORATTA, MON_ONISUZUME, 0 + db 17, MON_YADON, 0 + db 14, MON_ARBO, MON_SAND, 0 + db 21, MON_NIDORAN_M, 0 + db 21, MON_ARBO, 0 + db 19, MON_SAND, MON_ZUBAT, 0 + db 17, MON_KORATTA, MON_KORATTA, MON_RATTA, 0 + db 18, MON_NIDORAN_M, MON_NIDORINO, 0 + db 17, MON_ONISUZUME, MON_KORATTA, MON_KORATTA, MON_ONISUZUME, 0 -SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF],BANK[$E] AkaneGroup:: BugCatcherBoyGroup:: ; BUG_CATCHER_BOY_JUNICHI @@ -97,31 +110,114 @@ OkeraGroup:: db 19, MON_KORATTA, MON_DIGDA, MON_ARBO, MON_SAND, 0 db 29, MON_NIDORAN_M, MON_NIDORINO, 0 -SECTION "Trainer Parties 4 TEMPORARY", ROMX[$52B4],BANK[$E] MikanGroup:: +; Leftover Jr.Trainer♀ data from Red/Blue + db 19, MON_TOSAKINTO, 0 + db 16, MON_KORATTA, MON_PIKACHU, 0 + db 16, MON_POPPO, MON_POPPO, MON_POPPO, 0 + db 22, MON_FUSHIGIDANE, 0 + db 18, MON_NAZONOKUSA, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MADATSUBOMI, 0 + db 23, MON_NYARTH, 0 + db 20, MON_PIKACHU, MON_PIPPI, 0 + db 21, MON_POPPO, MON_PIGEON, 0 + db 21, MON_PURIN, MON_POPPO, MON_NYARTH, 0 + db 22, MON_NAZONOKUSA, MON_FUSHIGIDANE, 0 + db 24, MON_FUSHIGIDANE, MON_FUSHIGISOU, 0 + db 24, MON_POPPO, MON_NYARTH, MON_KORATTA, MON_PIKACHU, MON_NYARTH, 0 + db 30, MON_NYOROMO, MON_NYOROMO, 0 + db 27, MON_POPPO, MON_NYARTH, MON_POPPO, MON_PIGEON, 0 + db 28, MON_TOSAKINTO, MON_NYOROMO, MON_TATTU, 0 + db 31, MON_TOSAKINTO, MON_AZUMAO, 0 + db 22, MON_MADATSUBOMI, MON_PIPPI, 0 + db 20, MON_NYARTH, MON_NAZONOKUSA, MON_POPPO, 0 + db 19, MON_POPPO, MON_KORATTA, MON_KORATTA, MON_MADATSUBOMI, 0 + db 28, MON_KUSAIHANA, MON_NAZONOKUSA, MON_NAZONOKUSA, 0 + db 29, MON_PIKACHU, MON_RAICHU, 0 + db 33, MON_PIPPI, 0 + db 29, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MONJARA, 0 + db 30, MON_MENOKURAGE, MON_TATTU, MON_PAWOU, 0 -SECTION "Trainer Parties 5 TEMPORARY", ROMX[$5320],BANK[$E] BlueGroup:: +; Leftover Pokémaniac data from Red/Blue + db 30, MON_SIHORN, MON_BERORINGA, 0 + db 20, MON_KARAKARA, MON_YADON, 0 + db 20, MON_YADON, MON_YADON, MON_YADON, 0 + db 22, MON_HITOKAGE, MON_KARAKARA, 0 + db 25, MON_YADON, 0 + db 40, MON_LIZARDO, MON_LAPLACE, MON_BERORINGA, 0 + db 23, MON_KARAKARA, MON_YADON, 0 -SECTION "Trainer Parties 6 TEMPORARY", ROMX[$533D],BANK[$E] GamaGroup:: +; Leftover Super Nerd data from Red/Blue + db 11, MON_COIL, MON_BIRIRIDAMA, 0 + db 12, MON_BETBETER, MON_BIRIRIDAMA, MON_DOGARS, 0 + db 20, MON_BIRIRIDAMA, MON_DOGARS, MON_BIRIRIDAMA, MON_COIL, 0 + db 22, MON_BETBETER, MON_BETBETON, MON_BETBETER, 0 + db 26, MON_DOGARS, 0 + db 22, MON_DOGARS, MON_COIL, MON_MATADOGAS, 0 + db 20, MON_COIL, MON_COIL, MON_DOGARS, MON_COIL, 0 + db 24, MON_COIL, MON_BIRIRIDAMA, 0 + db 36, MON_ROKON, MON_ROKON, MON_KYUKON, 0 + db 34, MON_PONYTA, MON_HITOKAGE, MON_ROKON, MON_GARDIE, 0 + db 41, MON_GALLOP, 0 + db 37, MON_GARDIE, MON_ROKON, 0 -SECTION "Trainer Parties 7 TEMPORARY", ROMX[$5375],BANK[$E] RivalGroup:: db 5, DEX_KURUSU, 0 db 5, DEX_HAPPA, 0 db 5, DEX_HONOGUMA, 0 +; Leftover Hiker data from Red/Blue + db 10, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_IWARK, 0 + db 15, MON_WANRIKY, MON_ISITSUBUTE, 0 + db 13, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, 0 + db 17, MON_IWARK, 0 + db 21, MON_ISITSUBUTE, MON_IWARK, 0 + db 20, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, 0 + db 21, MON_ISITSUBUTE, MON_IWARK, 0 + db 19, MON_IWARK, MON_GOLONE, 0 + db 21, MON_ISITSUBUTE, MON_ISITSUBUTE, MON_GOLONE, 0 + db 25, MON_ISITSUBUTE, 0 + db 20, MON_WANRIKY, MON_IWARK, 0 + db 19, MON_ISITSUBUTE, MON_WANRIKY, MON_ISITSUBUTE, MON_ISITSUBUTE, 0 + db 20, MON_IWARK, MON_IWARK, MON_ISITSUBUTE, 0 + db 21, MON_ISITSUBUTE, MON_GOLONE, 0 -SECTION "Trainer Parties 8 TEMPORARY", ROMX[$53BC],BANK[$E] OkidoGroup:: +; Leftover Biker data from Red/Blue + db 28, MON_DOGARS, MON_DOGARS, MON_DOGARS, 0 + db 29, MON_DOGARS, MON_BETBETER, 0 + db 25, MON_DOGARS, MON_DOGARS, MON_MATADOGAS, MON_DOGARS, MON_BETBETER, 0 + db 28, MON_DOGARS, MON_BETBETER, MON_MATADOGAS, 0 + db 29, MON_BETBETER, MON_DOGARS, 0 + db 33, MON_MATADOGAS, 0 + db 26, MON_BETBETER, MON_BETBETER, MON_BETBETER, MON_BETBETER, 0 + db 28, MON_MATADOGAS, MON_DOGARS, MON_MATADOGAS, 0 + db 33, MON_BETBETON, 0 + db 29, MON_BIRIRIDAMA, MON_BIRIRIDAMA, 0 + db 29, MON_MATADOGAS, MON_BETBETON, 0 + db 25, MON_DOGARS, MON_MATADOGAS, MON_DOGARS, MON_DOGARS, MON_MATADOGAS, 0 + db 26, MON_DOGARS, MON_DOGARS, MON_BETBETER, MON_DOGARS, 0 + db 28, MON_BETBETER, MON_BETBETER, MON_DOGARS, 0 + db 29, MON_DOGARS, MON_BETBETON, 0 -SECTION "Trainer Parties 9 TEMPORARY", ROMX[$5404],BANK[$E] SakakiGroup:: +; Leftover Burglar data from Red/Blue + db 29, MON_GARDIE, MON_ROKON, 0 + db 33, MON_GARDIE, 0 + db 28, MON_ROKON, MON_HITOKAGE, MON_PONYTA, 0 + db 36, MON_GARDIE, MON_ROKON, MON_KYUKON, 0 + db 41, MON_PONYTA, 0 + db 37, MON_ROKON, MON_GARDIE, 0 + db 34, MON_HITOKAGE, MON_LIZARDO, 0 + db 38, MON_KYUKON, 0 + db 34, MON_GARDIE, MON_PONYTA, 0 -SECTION "Trainer Parties 10 TEMPORARY", ROMX[$5427],BANK[$E] ProtagonistGroup:: +; Leftover Engineer data from Red/Blue + db 21, MON_BIRIRIDAMA, MON_COIL, 0 + db 21, MON_COIL, 0 + db 18, MON_COIL, MON_COIL, MON_RARECOIL, 0 -SECTION "Trainer Parties 11 TEMPORARY", ROMX[$5433],BANK[$E] SibaGroup:: KasumiGroup:: FisherGroup:: @@ -248,7 +344,6 @@ BikerGroup:: db 38, MON_GHOST, 0 db 33, MON_GHOS, MON_GHOS, MON_GHOST, 0 -SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5956],BANK[$E] RockClimberGroup:: ; Leftover Agatha data from Red/Blue db -1, 56, MON_GANGAR, 56, MON_GOLBAT, 55, MON_GHOST, 58, MON_ARBOK, 60, MON_GANGAR, 0 |