Merge branch 'master' into build_more_roms

1 files changed, 212 insertions, 114 deletions

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index d31c34c..f91aba7 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -16,6 +16,8 @@ INCLUDE "data/trainers/party_pointers.inc"
 ; TODO: decode all data
 
 if def(GOLD)
+HayatoGroup::
+
 SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF],BANK[$E]
 AkaneGroup::
 BugCatcherBoyGroup::
@@ -29,168 +31,239 @@ BugCatcherBoyGroup::
 	db  9, DEX_REDIBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
 	db -1 ; end
 
-SECTION "Trainer Parties 2 TEMPORARY", ROMX[$52B4],BANK[$E]
-MikanGroup::
-
-SECTION "Trainer Parties 3 TEMPORARY", ROMX[$53BC],BANK[$E]
-OkidoGroup::
+; Leftover Bug Catcher data from Red/Blue
+	db  6, MON_BEEDLE, MON_CATERPIE, 0
+	db  7, MON_BEEDLE, MON_COCOON, MON_BEEDLE, 0
+	db  9, MON_BEEDLE, 0
+	db 10, MON_CATERPIE, MON_BEEDLE, MON_CATERPIE, 0
+	db  9, MON_BEEDLE, MON_COCOON, MON_CATERPIE, MON_TRANSEL, 0
+	db 11, MON_CATERPIE, MON_TRANSEL, 0
+	db 11, MON_BEEDLE, MON_COCOON, 0
+	db 10, MON_CATERPIE, MON_TRANSEL, MON_CATERPIE, 0
+	db 14, MON_CATERPIE, MON_BEEDLE, 0
+	db 16, MON_BEEDLE, MON_CATERPIE, MON_BEEDLE, 0
+	db 20, MON_BUTTERFREE, 0
+	db 18, MON_TRANSEL, MON_CATERPIE, MON_KONGPANG, 0
+	db 19, MON_SPEAR, MON_SPEAR, 0
+	db 20, MON_CATERPIE, MON_BEEDLE, MON_KONGPANG, 0
 
-SECTION "Trainer Parties 4 TEMPORARY", ROMX[$54B6],BANK[$E]
-WataruGroup::
-
-SECTION "Trainer Parties 5 TEMPORARY", ROMX[$54DC],BANK[$E]
-GerugeMemberMGroup::
-
-SECTION "Trainer Parties 6 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
+TsukishiGroup::
+LassGroup::
+	; LASS_ATSUKO
+	db "あつこ@", TRAINERTYPE_ITEM_MOVES
+	db  8, DEX_NAZONOKUSA, ITEM_NONE
+	; No moves?
 	db -1 ; end
 
-SECTION "Trainer Parties 7 TEMPORARY", ROMX[$55F4],BANK[$E]
-FledglingGroup::
+; Leftover Lass data from Red/Blue
+	db  9, MON_POPPO, MON_POPPO, 0
+	db 10, MON_KORATTA, MON_NIDORAN_M, 0
+	db 14, MON_PURIN, 0
+	db 31, MON_PARAS, MON_PARAS, MON_PARASECT, 0
+	db 11, MON_NAZONOKUSA, MON_MADATSUBOMI, 0
+	db 14, MON_PIPPI, 0
+	db 16, MON_POPPO, MON_NIDORAN_F, 0
+	db 14, MON_POPPO, MON_NIDORAN_F, 0
+	db 15, MON_NIDORAN_M, MON_NIDORAN_F, 0
+	db 13, MON_NAZONOKUSA, MON_POPPO, MON_NAZONOKUSA, 0
+	db 18, MON_POPPO, MON_NIDORAN_F, 0
+	db 18, MON_KORATTA, MON_PIKACHU, 0
+	db 23, MON_NIDORAN_F, MON_NIDORINA, 0
+	db 24, MON_NYARTH, MON_NYARTH, MON_NYARTH, 0
+	db 19, MON_POPPO, MON_KORATTA, MON_NIDORAN_M, MON_NYARTH, MON_PIKACHU, 0
+	db 22, MON_PIPPI, MON_PIPPI, 0
+	db 23, MON_MADATSUBOMI, MON_UTSUDON, 0
+	db 23, MON_NAZONOKUSA, MON_KUSAIHANA, 0
 
-SECTION "Trainer Parties 8 TEMPORARY", ROMX[$56D7],BANK[$E]
-PokeManiacGroup::
+EnokiGroup::
+; Leftover Sailor data from Red/Blue
+	db 18, MON_WANRIKY, MON_SHELLDER, 0
+	db 17, MON_WANRIKY, MON_MENOKURAGE, 0
+	db 21, MON_SHELLDER, 0
+	db 17, MON_TATTU, MON_SHELLDER, MON_MENOKURAGE, 0
+	db 18, MON_MENOKURAGE, MON_HITODEMAN, 0
+	db 17, MON_TATTU, MON_TATTU, MON_TATTU, 0
+	db 20, MON_WANRIKY, 0
+	db 21, MON_PIKACHU, MON_PIKACHU, 0
 
-SECTION "Trainer Parties 9 TEMPORARY", ROMX[$57C5],BANK[$E]
-GentlemanGroup::
+OkeraGroup::
+; Leftover Jr.Trainer♂ data from Red/Blue
+	db 11, MON_DIGDA, MON_SAND, 0
+	db 14, MON_KORATTA, MON_ARBO, 0
+	db 18, MON_MANKEY, 0
+	db 20, MON_ZENIGAME, 0
+	db 16, MON_ONISUZUME, MON_RATTA, 0
+	db 18, MON_DIGDA, MON_DIGDA, MON_SAND, 0
+	db 21, MON_GARDIE, MON_HITOKAGE, 0
+	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::
 
-SECTION "Trainer Parties 10 TEMPORARY", ROMX[$57E9],BANK[$E]
-TeacherMGroup::
+SECTION "Trainer Parties 5 TEMPORARY", ROMX[$5320],BANK[$E]
+BlueGroup::
 
-SECTION "Trainer Parties 11 TEMPORARY", ROMX[$57F5],BANK[$E]
-TeacherFGroup::
+SECTION "Trainer Parties 6 TEMPORARY", ROMX[$533D],BANK[$E]
+GamaGroup::
 
-SECTION "Trainer Parties 12 TEMPORARY", ROMX[$57FB],BANK[$E]
-ManchildGroup::
+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
 
-SECTION "Trainer Parties 13 TEMPORARY", ROMX[$58CC],BANK[$E]
-RockerGroup::
+SECTION "Trainer Parties 8 TEMPORARY", ROMX[$53BC],BANK[$E]
+OkidoGroup::
 
-SECTION "Trainer Parties 14 TEMPORARY", ROMX[$58FB],BANK[$E]
-HikerGroup::
+SECTION "Trainer Parties 9 TEMPORARY", ROMX[$5404],BANK[$E]
+SakakiGroup::
 
-SECTION "Trainer Parties 15 TEMPORARY", ROMX[$59A2],BANK[$E]
-KimonoGirlGroup::
-	; KIMONO_GIRL_TAMAO
-	db "たまお@", TRAINERTYPE_ITEM_MOVES
-	db 12, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 10 TEMPORARY", ROMX[$5427],BANK[$E]
+ProtagonistGroup::
 
-	; KIMONO_GIRL_KOUME
-	db "こうめ@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
+SECTION "Trainer Parties 11 TEMPORARY", ROMX[$5433],BANK[$E]
+SibaGroup::
+KasumiGroup::
+FisherGroup::
+	; FISHER_HISASHI
+	db "ひさし@", TRAINERTYPE_ITEM_MOVES
+	db  8, DEX_PUKU, ITEM_NONE
+	; No moves?
 	db -1 ; end
 
-SECTION "Trainer Parties 16 TEMPORARY", ROMX[$518A],BANK[$E]
-HayatoGroup::
-
-SECTION "Trainer Parties 17 TEMPORARY", ROMX[$521A],BANK[$E]
-TsukishiGroup::
-LassGroup::
+SECTION "Trainer Parties 12 TEMPORARY", ROMX[$5472],BANK[$E]
+KannaGroup::
 
-SECTION "Trainer Parties 18 TEMPORARY", ROMX[$526F],BANK[$E]
-EnokiGroup::
+SECTION "Trainer Parties 13 TEMPORARY", ROMX[$54B6],BANK[$E]
+WataruGroup::
 
-SECTION "Trainer Parties 19 TEMPORARY", ROMX[$528F],BANK[$E]
-OkeraGroup::
+SECTION "Trainer Parties 14 TEMPORARY", ROMX[$54DC],BANK[$E]
+GerugeMemberMGroup::
 
-SECTION "Trainer Parties 20 TEMPORARY", ROMX[$533D],BANK[$E]
-GamaGroup::
+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
 
-SECTION "Trainer Parties 21 TEMPORARY", ROMX[$554B],BANK[$E]
+SECTION "Trainer Parties 16 TEMPORARY", ROMX[$554B],BANK[$E]
 Trio2Group::
 
-SECTION "Trainer Parties 22 TEMPORARY", ROMX[$555D],BANK[$E]
+SECTION "Trainer Parties 17 TEMPORARY", ROMX[$555D],BANK[$E]
 Trio3Group::
 
-SECTION "Trainer Parties 23 TEMPORARY", ROMX[$567C],BANK[$E]
-ProfessionalMGroup::
-ProfessionalFGroup::
+SECTION "Trainer Parties 18 TEMPORARY", ROMX[$5566],BANK[$E]
+RocketFGroup::
 
-SECTION "Trainer Parties 24 TEMPORARY", ROMX[$581B],BANK[$E]
-SwimmerMGroup::
+SECTION "Trainer Parties 19 TEMPORARY", ROMX[$5587],BANK[$E]
+YoungsterGroup::
 
-SECTION "Trainer Parties 25 TEMPORARY", ROMX[$582A],BANK[$E]
-SuperNerdGroup::
+SECTION "Trainer Parties 20 TEMPORARY", ROMX[$55F4],BANK[$E]
+FledglingGroup::
 
-SECTION "Trainer Parties 26 TEMPORARY", ROMX[$583C],BANK[$E]
-EngineerGroup::
+SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5658],BANK[$E]
+ProdigyGroup::
 
-SECTION "Trainer Parties 27 TEMPORARY", ROMX[$596E],BANK[$E]
-JugglerGroup::
+SECTION "Trainer Parties 22 TEMPORARY", ROMX[$567C],BANK[$E]
+ProfessionalMGroup::
+ProfessionalFGroup::
 
-SECTION "Trainer Parties 28 TEMPORARY", ROMX[$597A],BANK[$E]
-TwinsGroup::
+SECTION "Trainer Parties 23 TEMPORARY", ROMX[$56D7],BANK[$E]
+PokeManiacGroup::
 
-SECTION "Trainer Parties 29 TEMPORARY", ROMX[$597F],BANK[$E]
-SchoolboyGroup::
-	; SCHOOLBOY_TETSUYA
-	db "てつや@", TRAINERTYPE_ITEM_MOVES
-	db  9, DEX_YADOKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5795],BANK[$E]
+RocketMGroup::
 
-SECTION "Trainer Parties 30 TEMPORARY", ROMX[$598C],BANK[$E]
-FirebreatherGroup::
-	; FIREBREATHER_AKITO
-	db "あきと@", TRAINERTYPE_ITEM_MOVES
-	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
-	db -1 ; end
+SECTION "Trainer Parties 25 TEMPORARY", ROMX[$57C5],BANK[$E]
+GentlemanGroup::
 
-SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5320],BANK[$E]
-BlueGroup::
+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
 
-SECTION "Trainer Parties 32 TEMPORARY", ROMX[$5375],BANK[$E]
-RivalGroup::
+TeacherFGroup::
+; Leftover Brock data from Red/Blue
+	db -1, 12, MON_ISITSUBUTE, 14, MON_IWARK, 0
 
-SECTION "Trainer Parties 33 TEMPORARY", ROMX[$5404],BANK[$E]
-SakakiGroup::
+ManchildGroup::
+; Leftover Misty data from Red/Blue
+	db -1, 18, MON_HITODEMAN, 21, MON_STARMIE, 0
 
-SECTION "Trainer Parties 34 TEMPORARY", ROMX[$5427],BANK[$E]
-ProtagonistGroup::
+; Leftover Lt.Surge data from Red/Blue
+	db -1, 21, MON_BIRIRIDAMA, 18, MON_PIKACHU, 24, MON_RAICHU, 0
 
-SECTION "Trainer Parties 35 TEMPORARY", ROMX[$5433],BANK[$E]
-SibaGroup::
-KasumiGroup::
-FisherGroup::
+; Leftover Erika data from Red/Blue
+	db -1, 29, MON_UTSUBOT, 24, MON_MONJARA, 29, MON_RUFFRESIA, 0
 
-SECTION "Trainer Parties 36 TEMPORARY", ROMX[$5472],BANK[$E]
-KannaGroup::
+SwimmerFGroup::
+; Leftover Koga data from Red/Blue
+	db -1, 37, MON_DOGARS, 39, MON_BETBETON, 37, MON_DOGARS, 43, MON_MATADOGAS, 0
 
-SECTION "Trainer Parties 37 TEMPORARY", ROMX[$5566],BANK[$E]
-RocketFGroup::
+SwimmerMGroup::
+	db 10, DEX_BARIRINA, DEX_KIRINRIKI, DEX_PUCHICORN, 0
 
-SECTION "Trainer Parties 38 TEMPORARY", ROMX[$5587],BANK[$E]
-YoungsterGroup::
+SailorGroup::
+; Leftover Sabrina data from Red/Blue
+	db -1, 38, MON_YUNGERER, 37, MON_BARRIERD, 38, MON_MORPHON, 43, MON_FOODIN, 0
 
-SECTION "Trainer Parties 39 TEMPORARY", ROMX[$5658],BANK[$E]
-ProdigyGroup::
+SuperNerdGroup::
 
-SECTION "Trainer Parties 40 TEMPORARY", ROMX[$5795],BANK[$E]
-RocketMGroup::
+SECTION "Trainer Parties 27 TEMPORARY", ROMX[$583C],BANK[$E]
+EngineerGroup::
 
-SECTION "Trainer Parties 41 TEMPORARY", ROMX[$5811],BANK[$E]
-SwimmerFGroup::
+SECTION "Trainer Parties 28 TEMPORARY", ROMX[$58CC],BANK[$E]
+RockerGroup::
 
-SECTION "Trainer Parties 42 TEMPORARY", ROMX[$5820],BANK[$E]
-SailorGroup::
+SECTION "Trainer Parties 29 TEMPORARY", ROMX[$58FB],BANK[$E]
+HikerGroup::
 
-SECTION "Trainer Parties 43 TEMPORARY", ROMX[$5907],BANK[$E]
+SECTION "Trainer Parties 30 TEMPORARY", ROMX[$5907],BANK[$E]
 BikerGroup::
-
-SECTION "Trainer Parties 44 TEMPORARY", ROMX[$5956],BANK[$E]
+; Leftover Channeler data from Red/Blue
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 24, MON_GHOST, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 23, MON_GHOST, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 22, MON_GHOST, 0
+	db 22, MON_GHOS, MON_GHOS, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 24, MON_GHOS, 0
+	db 34, MON_GHOS, MON_GHOST, 0
+	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
 
-SECTION "Trainer Parties 45 TEMPORARY", ROMX[$5962],BANK[$E]
 BurglarGroup::
+; Leftover Lance data from Red/Blue
+	db -1, 58, MON_GYARADOS, 56, MON_HAKURYU, 56, MON_HAKURYU, 60, MON_PTERA, 62, MON_KAIRYU, 0
+
+JugglerGroup::
+	db  6, DEX_MARIL, DEX_GYOPIN, 0
 
-SECTION "Trainer Parties 46 TEMPORARY", ROMX[$5972],BANK[$E]
 BlackbeltGroup::
+	db  6, DEX_PY, DEX_GYOPIN, 0
 
-SECTION "Trainer Parties 47 TEMPORARY", ROMX[$5976],BANK[$E]
 PsychicGroup::
 KungFuMasterGroup::
 FortuneTellerGroup::
@@ -199,14 +272,39 @@ SageGroup::
 MediumGroup::
 SoldierGroup::
 GerugeMemberFGroup::
+	db 12, DEX_SHIBIREFUGU, DEX_MADAME, 0
+
+TwinsGroup::
+	db 13, DEX_MADAME, DEX_ELEBABY, DEX_MIZUUO, 0
+
+SchoolboyGroup::
+	; SCHOOLBOY_TETSUYA
+	db "てつや@", TRAINERTYPE_ITEM_MOVES
+	db  9, DEX_YADOKING, ITEM_NONE, MOVE_DISABLE, MOVE_CONFUSION, MOVE_NONE, MOVE_NONE
+	db -1 ; end
+
+FirebreatherGroup::
+	; FIREBREATHER_AKITO
+	db "あきと@", TRAINERTYPE_ITEM_MOVES
+	db 10, DEX_BOOBY, ITEM_NONE, MOVE_SCRATCH, MOVE_SMOG, MOVE_NONE, MOVE_NONE
+	db -1 ; end
 
-SECTION "Trainer Parties 48 TEMPORARY", ROMX[$5999],BANK[$E]
 SportsmanGroup::
 	; SPORTSMAN_SHIGEKI
 	db "しげき@", TRAINERTYPE_ITEM
 	db  8, DEX_DONPHAN, ITEM_NONE
 	db -1 ; end
 
+KimonoGirlGroup::
+	; KIMONO_GIRL_TAMAO
+	db "たまお@", TRAINERTYPE_ITEM_MOVES
+	db 12, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_ENCORE, MOVE_POUND, MOVE_NONE
+	db -1 ; end
+
+	; KIMONO_GIRL_KOUME
+	db "こうめ@", TRAINERTYPE_ITEM_MOVES
+	db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
+	db -1 ; end
 else