Merge pull request #9 from pret/master

Finish dumping trainer parties.

1 files changed, 238 insertions, 19 deletions

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 4514b38..8c702d1 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -227,56 +227,252 @@ FisherGroup::
 	db  8, DEX_PUKU, ITEM_NONE
 	; No moves?
 	db -1 ; end
+; Leftover Fisher data from Red/Blue
+	db 17, MON_TOSAKINTO, MON_MENOKURAGE, MON_TOSAKINTO, 0
+	db 17, MON_MENOKURAGE, MON_HITODEMAN, MON_SHELLDER, 0
+	db 22, MON_TOSAKINTO, MON_NYOROMO, MON_TOSAKINTO, 0
+	db 24, MON_MENOKURAGE, MON_TOSAKINTO, 0
+	db 27, MON_TOSAKINTO, 0
+	db 21, MON_NYOROMO, MON_SHELLDER, MON_TOSAKINTO, MON_TATTU, 0
+	db 28, MON_AZUMAO, MON_TOSAKINTO, MON_AZUMAO, MON_AZUMAO, 0
+	db 31, MON_SHELLDER, MON_PARSHEN, 0
+	db 27, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, MON_KOIKING, 0
+	db 33, MON_AZUMAO, MON_TOSAKINTO, 0
+	db 24, MON_KOIKING, MON_KOIKING, 0
 
-SECTION "Trainer Parties 12 TEMPORARY", ROMX[$5472],BANK[$E]
 KannaGroup::
+; Leftover Swimmer data from Red/Blue
+	db 16, MON_TATTU, MON_SHELLDER, 0
+	db 30, MON_MENOKURAGE, MON_SHELLDER, 0
+	db 29, MON_TOSAKINTO, MON_TATTU, MON_HITODEMAN, 0
+	db 30, MON_NYOROMO, MON_NYOROZO, 0
+	db 27, MON_TATTU, MON_MENOKURAGE, MON_MENOKURAGE, MON_TOSAKINTO, 0
+	db 29, MON_TOSAKINTO, MON_SHELLDER, MON_AZUMAO, 0
+	db 30, MON_TATTU, MON_TATTU, 0
+	db 27, MON_MENOKURAGE, MON_MENOKURAGE, MON_HITODEMAN, MON_TATTU, MON_DOKUKURAGE, 0
+	db 31, MON_SHELLDER, MON_PARSHEN, 0
+	db 35, MON_HITODEMAN, 0
+	db 28, MON_TATTU, MON_TATTU, MON_SEADRA, MON_TATTU, 0
+	db 33, MON_SEADRA, MON_DOKUKURAGE, 0
+	db 37, MON_STARMIE, 0
+	db 33, MON_HITODEMAN, MON_KAMEIL, 0
+	db 32, MON_NYOROZO, MON_MENOKURAGE, MON_SEADRA, 0
 
-SECTION "Trainer Parties 13 TEMPORARY", ROMX[$54B6],BANK[$E]
 WataruGroup::
+; Leftover Cue Ball data from Red/Blue
+	db 28, MON_WANRIKY, MON_MANKEY, MON_WANRIKY, 0
+	db 29, MON_MANKEY, MON_WANRIKY, 0
+	db 33, MON_WANRIKY, 0
+	db 29, MON_MANKEY, MON_OKORIZARU, 0
+	db 29, MON_WANRIKY, MON_GORIKY, 0
+	db 33, MON_GORIKY, 0
+	db 26, MON_MANKEY, MON_MANKEY, MON_GORIKY, MON_WANRIKY, 0
+	db 29, MON_OKORIZARU, MON_GORIKY, 0
+	db 31, MON_MENOKURAGE, MON_MENOKURAGE, MON_DOKUKURAGE, 0
 
-SECTION "Trainer Parties 14 TEMPORARY", ROMX[$54DC],BANK[$E]
 GerugeMemberMGroup::
+; Leftover Gambler data from Red/Blue
+	db 18, MON_NYOROMO, MON_TATTU, 0
+	db 18, MON_MADATSUBOMI, MON_NAZONOKUSA, 0
+	db 18, MON_BIRIRIDAMA, MON_COIL, 0
+	db 18, MON_GARDIE, MON_ROKON, 0
+	db 22, MON_NYOROMO, MON_NYOROMO, MON_NYOROZO, 0
+	db 22, MON_IWARK, MON_ISITSUBUTE, MON_GOLONE, 0
+	db 24, MON_GARDIE, MON_ROKON, 0
 
-SECTION "Trainer Parties 15 TEMPORARY", ROMX[$54FA],BANK[$E]
 Trio1Group::
 BeautyGroup::
 	; BEAUTY_MEGUMI
 	db "めぐみ@", TRAINERTYPE_ITEM_MOVES
 	db 10, DEX_NYARTH, ITEM_NONE, MOVE_PAY_DAY, MOVE_GROWL, MOVE_NONE, MOVE_NONE
 	db -1 ; end
+; Leftover Beauty data from Red/Blue
+	db 21, MON_NAZONOKUSA, MON_MADATSUBOMI, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
+	db 24, MON_MADATSUBOMI, MON_MADATSUBOMI, 0
+	db 26, MON_TAMATAMA, 0
+	db 27, MON_KORATTA, MON_PIKACHU, MON_KORATTA, 0
+	db 29, MON_PIPPI, MON_NYARTH, 0
+	db 35, MON_AZUMAO, 0
+	db 30, MON_SHELLDER, MON_SHELLDER, MON_PARSHEN, 0
+	db 31, MON_NYOROMO, MON_AZUMAO, 0
+	db 29, MON_PIGEON, MON_PUKURIN, 0
+	db 29, MON_FUSHIGIDANE, MON_FUSHIGISOU, 0
+	db 33, MON_UTSUDON, MON_MADATSUBOMI, MON_UTSUDON, 0
+	db 27, MON_NYOROMO, MON_TOSAKINTO, MON_AZUMAO, MON_TOSAKINTO, MON_NYOROMO, 0
+	db 30, MON_TOSAKINTO, MON_AZUMAO, 0
+	db 29, MON_HITODEMAN, MON_HITODEMAN, MON_HITODEMAN, 0
+	db 30, MON_SEADRA, MON_TATTU, MON_SEADRA, 0
 
-SECTION "Trainer Parties 16 TEMPORARY", ROMX[$554B],BANK[$E]
 Trio2Group::
+; Leftover Psychic data from Red/Blue
+	db 31, MON_YUNGERER, MON_YADON, MON_BARRIERD, MON_YUNGERER, 0
+	db 34, MON_BARRIERD, MON_YUNGERER, 0
+	db 33, MON_YADON, MON_YADON, MON_YADORAN, 0
+	db 38, MON_YADORAN, 0
 
-SECTION "Trainer Parties 17 TEMPORARY", ROMX[$555D],BANK[$E]
 Trio3Group::
+; Leftover Rocker data from Red/Blue
+	db 20, MON_BIRIRIDAMA, MON_COIL, MON_BIRIRIDAMA, 0
+	db 29, MON_BIRIRIDAMA, MON_MARUMINE, 0
 
-SECTION "Trainer Parties 18 TEMPORARY", ROMX[$5566],BANK[$E]
 RocketFGroup::
+; Leftover Juggler data from Red/Blue
+	db 29, MON_YUNGERER, MON_BARRIERD, 0
+	db 41, MON_SLEEPE, MON_SLEEPER, MON_YUNGERER, MON_YUNGERER, 0
+	db 31, MON_SLEEPE, MON_SLEEPE, MON_YUNGERER, MON_SLEEPE, 0
+	db 34, MON_SLEEPE, MON_SLEEPER, 0
+	db 48, MON_BARRIERD, 0
+	db 33, MON_SLEEPER, 0
+	db 38, MON_SLEEPER, 0
+	db 34, MON_SLEEPE, MON_YUNGERER, 0
 
-SECTION "Trainer Parties 19 TEMPORARY", ROMX[$5587],BANK[$E]
 YoungsterGroup::
+; Leftover Tamer data from Red/Blue
+	db 34, MON_SANDPAN, MON_ARBOK, 0
+	db 33, MON_ARBOK, MON_SANDPAN, MON_ARBOK, 0
+	db 43, MON_SIHORN, 0
+	db 39, MON_ARBOK, MON_KENTAUROS, 0
+	db 44, MON_PERSIAN, MON_GOLDUCK, 0
+	db 42, MON_SIHORN, MON_OKORIZARU, MON_ARBOK, MON_KENTAUROS, 0
+; Leftover Bird Keeper data from Red/Blue
+	db 29, MON_POPPO, MON_PIGEON, 0
+	db 25, MON_ONISUZUME, MON_POPPO, MON_POPPO, MON_ONISUZUME, MON_ONISUZUME, 0
+	db 26, MON_POPPO, MON_PIGEON, MON_ONISUZUME, MON_ONIDRILL, 0
+	db 33, MON_KAMONEGI, 0
+	db 29, MON_ONISUZUME, MON_ONIDRILL, 0
+	db 26, MON_PIGEON, MON_KAMONEGI, MON_DODO, MON_POPPO, 0
+	db 28, MON_DODORIO, MON_DODO, MON_DODO, 0
+	db 29, MON_ONISUZUME, MON_ONIDRILL, 0
+	db 34, MON_DODORIO, 0
+	db 26, MON_ONISUZUME, MON_ONISUZUME, MON_ONIDRILL, MON_ONISUZUME, 0
+	db 30, MON_ONIDRILL, MON_ONIDRILL, MON_PIGEON, 0
+	db 39, MON_PIGEON, MON_PIGEON, MON_POPPO, MON_PIGEON, 0
+	db 42, MON_KAMONEGI, MON_ONIDRILL, 0
+	db 28, MON_POPPO, MON_DODO, MON_PIGEON, 0
+	db 26, MON_POPPO, MON_ONISUZUME, MON_POPPO, MON_ONIDRILL, 0
+	db 29, MON_PIGEON, MON_ONIDRILL, 0
+	db 28, MON_ONISUZUME, MON_DODO, MON_ONIDRILL, 0
 
-SECTION "Trainer Parties 20 TEMPORARY", ROMX[$55F4],BANK[$E]
 FledglingGroup::
+; Leftover Blackbelt data from Red/Blue
+	db 37, MON_SAWAMULAR, MON_EBIWALAR, 0
+	db 31, MON_MANKEY, MON_MANKEY, MON_OKORIZARU, 0
+	db 32, MON_WANRIKY, MON_GORIKY, 0
+	db 36, MON_OKORIZARU, 0
+	db 31, MON_WANRIKY, MON_MANKEY, MON_OKORIZARU, 0
+	db 40, MON_WANRIKY, MON_GORIKY, 0
+	db 43, MON_GORIKY, 0
+	db 38, MON_GORIKY, MON_WANRIKY, MON_GORIKY, 0
+	db 43, MON_GORIKY, MON_WANRIKY, MON_GORIKY, 0
+; Unused Green(?) data
+	db 50, DEX_TEPPOUO, DEX_LIP, DEX_KIREIHANA, DEX_FUSHIGIDANE, DEX_HITOKAGE, DEX_ZENIGAME, 0
+; Leftover Green data from Red/Blue
+	db 5, MON_FUSHIGIDANE, 0
+	db 5, MON_HITOKAGE, 0
+	db -1, 9, MON_POPPO, 8, MON_ZENIGAME, 0
+	db -1, 9, MON_POPPO, 8, MON_FUSHIGIDANE, 0
+	db -1, 9, MON_POPPO, 8, MON_HITOKAGE, 0
+	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_ZENIGAME, 0
+	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_FUSHIGIDANE, 0
+	db -1, 18, MON_PIGEON, 15, MON_CASEY, 15, MON_KORATTA, 17, MON_HITOKAGE, 0
 
-SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5658],BANK[$E]
 ProdigyGroup::
+; Leftover Prof.Oak data from Red/Blue
+	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_KAMEX, 70, MON_GYARADOS, 0
+	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_FUSHIGIBANA, 70, MON_GYARADOS, 0
+	db -1, 66, MON_KENTAUROS, 67, MON_NASSY, 68, MON_WINDIE, 69, MON_LIZARDON, 70, MON_GYARADOS, 0
 
-SECTION "Trainer Parties 22 TEMPORARY", ROMX[$567C],BANK[$E]
 ProfessionalMGroup::
 ProfessionalFGroup::
+; Leftover Scientist data from Red/Blue
+	db 34, MON_DOGARS, MON_BIRIRIDAMA, 0
+	db 26, MON_BETBETER, MON_MATADOGAS, MON_DOGARS, MON_MATADOGAS, 0
+	db 28, MON_COIL, MON_BIRIRIDAMA, MON_RARECOIL, 0
+	db 29, MON_MARUMINE, MON_MATADOGAS, 0
+	db 33, MON_MARUMINE, 0
+	db 26, MON_RARECOIL, MON_DOGARS, MON_MATADOGAS, MON_COIL, 0
+	db 25, MON_BIRIRIDAMA, MON_DOGARS, MON_RARECOIL, MON_COIL, MON_DOGARS, 0
+	db 29, MON_MARUMINE, MON_BETBETON, 0
+	db 29, MON_BETBETER, MON_MARUMINE, 0
+	db 28, MON_BIRIRIDAMA, MON_DOGARS, MON_RARECOIL, 0
+	db 29, MON_COIL, MON_DOGARS, 0
+	db 33, MON_COIL, MON_RARECOIL, MON_BIRIRIDAMA, 0
+	db 34, MON_COIL, MON_MARUMINE, 0
+; Leftover Giovanni data from Red/Blue
+	db -1, 25, MON_IWARK, 24, MON_SIHORN, 29, MON_GARURA, 0
+	db -1, 37, MON_NIDORINO, 35, MON_GARURA, 37, MON_SIHORN, 41, MON_NIDOQUEEN, 0
+	db -1, 45, MON_SIHORN, 42, MON_DUGTRIO, 44, MON_NIDOQUEEN, 45, MON_NIDOKING, 50, MON_SIDON, 0
 
-SECTION "Trainer Parties 23 TEMPORARY", ROMX[$56D7],BANK[$E]
 PokeManiacGroup::
+; Leftover Rocket data from Red/Blue
+	db 13, MON_KORATTA, MON_ZUBAT, 0
+	db 11, MON_SAND, MON_KORATTA, MON_ZUBAT, 0
+	db 12, MON_ZUBAT, MON_ARBO, 0
+	db 16, MON_RATTA, 0
+	db 17, MON_WANRIKY, MON_SLEEPE, 0
+	db 15, MON_ARBO, MON_ZUBAT, 0
+	db 20, MON_RATTA, MON_ZUBAT, 0
+	db 21, MON_SLEEPE, MON_WANRIKY, 0
+	db 21, MON_RATTA, MON_RATTA, 0
+	db 20, MON_BETBETER, MON_DOGARS, MON_DOGARS, 0
+	db 19, MON_KORATTA, MON_RATTA, MON_RATTA, MON_KORATTA, 0
+	db 22, MON_BETBETER, MON_DOGARS, 0
+	db 17, MON_ZUBAT, MON_DOGARS, MON_BETBETER, MON_ZUBAT, MON_RATTA, 0
+	db 20, MON_KORATTA, MON_RATTA, MON_SLEEPE, 0
+	db 21, MON_WANRIKY, MON_WANRIKY, 0
+	db 23, MON_SAND, MON_ARBO, MON_SANDPAN, 0
+	db 23, MON_ARBO, MON_SAND, MON_ARBOK, 0
+	db 21, MON_DOGARS, MON_ZUBAT, 0
+	db 25, MON_ZUBAT, MON_ZUBAT, MON_GOLBAT, 0
+	db 26, MON_DOGARS, MON_SLEEPE, 0
+	db 23, MON_ZUBAT, MON_KORATTA, MON_RATTA, MON_ZUBAT, 0
+	db 26, MON_SLEEPE, MON_DOGARS, 0
+	db 29, MON_KARAKARA, MON_ZUBAT, 0
+	db 25, MON_GOLBAT, MON_ZUBAT, MON_ZUBAT, MON_RATTA, MON_ZUBAT, 0
+	db 28, MON_RATTA, MON_SLEEPER, MON_RATTA, 0
+	db 29, MON_WANRIKY, MON_SLEEPE, 0
+	db 28, MON_ARBO, MON_ZUBAT, MON_KARAKARA, 0
+	db 33, MON_ARBOK, 0
+	db 33, MON_SLEEPER, 0
+	db 29, MON_WANRIKY, MON_GORIKY, 0
+	db 28, MON_ZUBAT, MON_ZUBAT, MON_GOLBAT, 0
+	db 26, MON_RATTA, MON_ARBOK, MON_DOGARS, MON_GOLBAT, 0
+	db 29, MON_KARAKARA, MON_KARAKARA, 0
+	db 29, MON_SAND, MON_SANDPAN, 0
+	db 26, MON_RATTA, MON_ZUBAT, MON_GOLBAT, MON_KORATTA, 0
+	db 28, MON_MATADOGAS, MON_GOLBAT, MON_DOGARS, 0
+	db 28, MON_SLEEPE, MON_BETBETER, MON_WANRIKY, 0
+	db 28, MON_GOLBAT, MON_SLEEPE, MON_SLEEPER, 0
+	db 33, MON_GORIKY, 0
+	db 25, MON_KORATTA, MON_KORATTA, MON_ZUBAT, MON_KORATTA, MON_ARBO, 0
+	db 32, MON_KARAKARA, MON_SLEEPE, MON_GARAGARA, 0
 
-SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5795],BANK[$E]
 RocketMGroup::
+; Unused
+	db 13, DEX_KOTORA, DEX_GONGU, DEX_KIREIHANA, 0
+; Leftover Cooltrainer♂ data from Red/Blue
+	db 39, MON_NIDORINO, MON_NIDOKING, 0
+	db 43, MON_NASSY, MON_PARSHEN, MON_WINDIE, 0
+	db 43, MON_KINGLER, MON_DOKUKURAGE, MON_KAMEX, 0
+	db 45, MON_KINGLER, MON_STARMIE, 0
+	db 42, MON_FUSHIGISOU, MON_KAMEIL, MON_LIZARDO, MON_LIZARDON, 0
+	db 44, MON_FUSHIGISOU, MON_KAMEIL, MON_LIZARDO, 0
+	db 49, MON_NIDOKING, 0
+	db 44, MON_KINGLER, MON_PARSHEN, 0
+	db 39, MON_SANDPAN, MON_DUGTRIO, 0
+	db 43, MON_SIHORN, 0
 
-SECTION "Trainer Parties 25 TEMPORARY", ROMX[$57C5],BANK[$E]
 GentlemanGroup::
+; Leftover Cooltrainer♀ data from Red/Blue
+	db 24, MON_UTSUDON, MON_KUSAIHANA, MON_FUSHIGISOU, 0
+	db 43, MON_MADATSUBOMI, MON_UTSUDON, MON_UTSUBOT, 0
+	db 43, MON_PARASECT, MON_JUGON, MON_LUCKY, 0
+	db 46, MON_RUFFRESIA, MON_BUTTERFREE, 0
+	db 44, MON_PERSIAN, MON_KYUKON, 0
+	db 45, MON_FUSHIGISOU, MON_FUSHIGIBANA, 0
+	db 45, MON_NIDORINA, MON_NIDOQUEEN, 0
+	db 43, MON_PERSIAN, MON_KYUKON, MON_RAICHU, 0
 
-SECTION "Trainer Parties 26 TEMPORARY", ROMX[$57E9],BANK[$E]
 TeacherMGroup::
 ; Leftover Bruno data from Red/Blue
 	db -1, 53, MON_IWARK, 55, MON_EBIWALAR, 55, MON_SAWAMULAR, 56, MON_IWARK, 58, MON_KAIRIKY, 0
@@ -307,17 +503,40 @@ SailorGroup::
 	db -1, 38, MON_YUNGERER, 37, MON_BARRIERD, 38, MON_MORPHON, 43, MON_FOODIN, 0
 
 SuperNerdGroup::
+; Leftover Gentleman data from Red/Blue
+	db 18, MON_GARDIE, MON_GARDIE, 0
+	db 19, MON_NIDORAN_M, MON_NIDORAN_F, 0
+	db 23, MON_PIKACHU, 0
+	db 48, MON_OKORIZARU, 0
+	db 17, MON_GARDIE, MON_PONYTA, 0
 
-SECTION "Trainer Parties 27 TEMPORARY", ROMX[$583C],BANK[$E]
 EngineerGroup::
+; Leftover Green data from Red/Blue
+	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_KAMEIL, 0
+	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_FUSHIGISOU, 0
+	db -1, 19, MON_PIGEON, 16, MON_RATTA, 18, MON_YUNGERER, 20, MON_LIZARDO, 0
+	db -1, 25, MON_PIGEON, 23, MON_GARDIE, 22, MON_TAMATAMA, 20, MON_YUNGERER, 25, MON_KAMEIL, 0
+	db -1, 25, MON_PIGEON, 23, MON_GYARADOS, 22, MON_GARDIE, 20, MON_YUNGERER, 25, MON_FUSHIGISOU, 0
+	db -1, 25, MON_PIGEON, 23, MON_TAMATAMA, 22, MON_GYARADOS, 20, MON_YUNGERER, 25, MON_LIZARDO, 0
+	db -1, 37, MON_PIGEOT, 38, MON_GARDIE, 35, MON_TAMATAMA, 35, MON_FOODIN, 40, MON_KAMEX, 0
+	db -1, 37, MON_PIGEOT, 38, MON_GYARADOS, 35, MON_GARDIE, 35, MON_FOODIN, 40, MON_FUSHIGIBANA, 0
+	db -1, 37, MON_PIGEOT, 38, MON_TAMATAMA, 35, MON_GYARADOS, 35, MON_FOODIN, 40, MON_LIZARDON, 0
+	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_GARDIE, 47, MON_TAMATAMA, 50, MON_FOODIN, 53, MON_KAMEX, 0
+	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_GYARADOS, 47, MON_GARDIE, 50, MON_FOODIN, 53, MON_FUSHIGIBANA, 0
+	db -1, 47, MON_PIGEOT, 45, MON_SIHORN, 45, MON_TAMATAMA, 47, MON_GYARADOS, 50, MON_FOODIN, 53, MON_LIZARDON, 0
 
-SECTION "Trainer Parties 28 TEMPORARY", ROMX[$58CC],BANK[$E]
 RockerGroup::
+; Unused
+	db 40, $C6, $C7, $C8, 0
+; Leftover Green data from Red/Blue
+	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_WINDIE, 63, MON_NASSY, 65, MON_KAMEX, 0
+	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_GYARADOS, 63, MON_WINDIE, 65, MON_FUSHIGIBANA, 0
+	db -1, 61, MON_PIGEOT, 59, MON_FOODIN, 61, MON_SIDON, 61, MON_NASSY, 63, MON_GYARADOS, 65, MON_LIZARDON, 0
 
-SECTION "Trainer Parties 29 TEMPORARY", ROMX[$58FB],BANK[$E]
 HikerGroup::
+; Leftover Lorelei data from Red/Blue
+	db -1, 54, MON_JUGON, 53, MON_PARSHEN, 54, MON_YADORAN, 56, MON_ROUGELA, 56, MON_LAPLACE, 0
 
-SECTION "Trainer Parties 30 TEMPORARY", ROMX[$5907],BANK[$E]
 BikerGroup::
 ; Leftover Channeler data from Red/Blue
 	db 22, MON_GHOS, 0