Added Pigtails Trainer Classes

RetroMoi · Aug 26, 2023 · 7c36f60 · 7c36f60
1 parent c74ac2c
commit 7c36f60
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 25 deletions.
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -551,6 +551,20 @@ PLAYER_F EQU __enum__
 
 	trainerclass AROMA_LADY
 	const LINDA
+
+	trainerclass ROSE
+
+	trainerclass LILY
+
+	trainerclass IRIS
+
+	trainerclass POPPY
+
+	trainerclass FELICIA
+
+	trainerclass VIOLET
+
+	trainerclass CLOVER
 
 	trainerclass TOWERTYCOON ; 1
 

diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm
@@ -474,6 +474,48 @@ TrainerClassAttributes: ; 3959c
 	dw AI_BASIC + AI_TYPES + AI_TYPES + AI_STATUS
 	dw CONTEXT_USE + SWITCH_RARELY
 	
+; Rose
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Lily
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Iris
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Poppy
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Felicia
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Violet
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
+; Clover
+	db 0, 0 ; items
+	db 10 ; base reward
+	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
+	dw CONTEXT_USE + SWITCH_SOMETIMES
+	
 ; TowerTycoon
 	db FULL_HEAL, FULL_RESTORE ; items
 	db 25 ; base reward

diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
@@ -78,5 +78,12 @@ TrainerClassNames::
 	db "STEAMER@"	       ; SPA_TRAINER
 	db "BATHER@"	       ; SPA_TRAINER_F
 	db "AROMA LADY@"	   ; AROMA_LADY
+	db "PIGTAILS@"		   ; ROSE
+	db "PIGTAILS@"		   ; LILY
+	db "PIGTAILS@"		   ; IRIS
+	db "PIGTAILS@"		   ; POPPY
+	db "PIGTAILS@"		   ; FELICIA
+	db "PIGTAILS@"		   ; VIOLET
+	db "PIGTAILS@"		   ; CLOVER
 	db "TYCOON@"		   ; TOWERTYCOON
 	
diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm
@@ -65,22 +65,17 @@ TrainerClassDVsAndPersonality: ; 270d6
 	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; locke
 	db   8, $88, $88, $88, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; pokefanm
 	db   8, $88, $88, $88, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; pokefanf
-	db  24, $DD, $BB, $DB, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; officerm
-	db  24, $7B, $DB, $FF, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; officerf
-	db  24, $E5, $FA, $D6, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; nurse
+	db  24, $DD, $BB, $DB, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; officer
 	db  20, $BB, $BB, $BB, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; pokemaniac
 	db  20, $BB, $BB, $BB, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; super nerd
 	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; lass
 	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; beauty
 	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; firebreather
 	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; juggler
 	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; schoolboy
-	db  12, $55, $55, $55, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; schoolgirl
 	db  24, $AA, $CC, $EE, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; psychic
-	db  24, $AA, $CC, $EE, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; hex maniac
 	db  24, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; couple
 	db  24, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; gentleman
-	db 100, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; rich boy (high EVs from vitamins)
 	db  24, $CC, $CC, $CC, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; lady
 	db  24, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; sailor
 	db  24, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; swimmerm
@@ -90,15 +85,12 @@ TrainerClassDVsAndPersonality: ; 270d6
 	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; boarder
 	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; skier
 	db  48, $FF, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; blackbelt
-	db  48, $FF, $DD, $DD, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; battle girl
 	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; teacher
-	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; guitaristm
-	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; guitaristf
+	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; guitarist
 	db  48, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; biker
-	db  48, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; roughneck
 	db  48, $EE, $EE, $EE, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; cooltrainerm
 	db  48, $EE, $EE, $EE, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; cooltrainerf
-	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; prof elm
+	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; prof spruce
 	db   0, $DD, $DF, $DD, ABILITY_1 | TIMID, FEMALE | PLAIN_FORM  ; teacherfast
 	db 252, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; triobror
 	db 252, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; triobrob
@@ -116,6 +108,14 @@ TrainerClassDVsAndPersonality: ; 270d6
 	db  24, $DD, $DD, $DD, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; skater
 	db  16, $88, $88, $88, ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; spatrainer
 	db  16, $88, $88, $88, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; spatrainerf
+	db  16, $88, $88, $88, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; aromalady
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; rose
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; lily
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; iris
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; poppy
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; felicia
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; violet
+	db  24, $AA, $AA, $AA, ABILITY_1 | QUIRKY, FEMALE | PLAIN_FORM ; clover
 	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, MALE | PLAIN_FORM   ; towertycoon
 
 ; 2715c
diff --git a/data/trainers/encounter_music.asm b/data/trainers/encounter_music.asm
@@ -35,22 +35,17 @@ TrainerEncounterMusic: ; e9027
 	db MUSIC_TEAM_SNARE_ENCOUNTER	; locke
 	db MUSIC_HIKER_ENCOUNTER		; pokefanm
 	db MUSIC_GENTLEMAN_ENCOUNTER	; pokefanf
-	db MUSIC_HIKER_ENCOUNTER		; officerm
-	db MUSIC_HIKER_ENCOUNTER		; officerf
-	db MUSIC_LASS_ENCOUNTER			; nurse
+	db MUSIC_HIKER_ENCOUNTER		; officer
 	db MUSIC_POKEMANIAC_ENCOUNTER	; pokemaniac
 	db MUSIC_POKEMANIAC_ENCOUNTER	; super_nerd
 	db MUSIC_LASS_ENCOUNTER			; lass
 	db MUSIC_GENTLEMAN_ENCOUNTER	; beauty
 	db MUSIC_HARDCORE_ENCOUNTER		; firebreather
 	db MUSIC_POKEMANIAC_ENCOUNTER	; juggler
 	db MUSIC_YOUNGSTER_ENCOUNTER	; schoolboy
-	db MUSIC_LASS_ENCOUNTER			; schoolgirl
 	db MUSIC_HARDCORE_ENCOUNTER		; psychic_t
-	db MUSIC_POKEMANIAC_ENCOUNTER	; hex_maniac
 	db MUSIC_NONE					; couple
 	db MUSIC_GENTLEMAN_ENCOUNTER	; gentleman
-	db MUSIC_GENTLEMAN_ENCOUNTER	; rich_boy
 	db MUSIC_GENTLEMAN_ENCOUNTER	; lady
 	db MUSIC_HIKER_ENCOUNTER		; sailor
 	db MUSIC_HIKER_ENCOUNTER		; swimmerm
@@ -60,12 +55,9 @@ TrainerEncounterMusic: ; e9027
 	db MUSIC_HARDCORE_ENCOUNTER		; boarder
 	db MUSIC_LASS_ENCOUNTER			; skier
 	db MUSIC_HARDCORE_ENCOUNTER		; blackbelt_t
-	db MUSIC_HARDCORE_ENCOUNTER		; battle_girl
 	db MUSIC_LASS_ENCOUNTER			; teacher
-	db MUSIC_HARDCORE_ENCOUNTER		; guitaristm
-	db MUSIC_HARDCORE_ENCOUNTER		; guitaristf
+	db MUSIC_HARDCORE_ENCOUNTER		; guitarist
 	db MUSIC_HARDCORE_ENCOUNTER		; biker
-	db MUSIC_HARDCORE_ENCOUNTER		; cueball
 	db MUSIC_HARDCORE_ENCOUNTER		; cooltrainerm
 	db MUSIC_HARDCORE_ENCOUNTER		; cooltrainerf
 	db MUSIC_NONE					; profspruce
@@ -86,6 +78,12 @@ TrainerEncounterMusic: ; e9027
 	db MUSIC_HARDCORE_ENCOUNTER		; skater
 	db MUSIC_HIKER_ENCOUNTER		; spatrainer
 	db MUSIC_LASS_ENCOUNTER			; spatrainerf
+	db MUSIC_GENTLEMAN_ENCOUNTER	; aromalady
+	db MUSIC_NONE					; rose
+	db MUSIC_NONE					; lily
+	db MUSIC_NONE					; iris
+	db MUSIC_NONE					; poppy
+	db MUSIC_NONE					; felicia
+	db MUSIC_NONE					; violet
+	db MUSIC_NONE					; clover
 	db MUSIC_NONE			 		; towertycoon
-
-; e906e
diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm
@@ -80,8 +80,15 @@ MallCopPalette:			 INCLUDE "gfx/trainers/mall_cop.pal"
 SkaterPalette:			 INCLUDE "gfx/trainers/skater.pal"
 SpatrainerPalette:		 INCLUDE "gfx/trainers/spa_trainer.pal"
 SpatrainerfPalette:		 INCLUDE "gfx/trainers/spa_trainer_f.pal"
-AromaLadyPalette:
-TowerTycoonPalette:		 INCLUDE "gfx/trainers/aroma_lady.pal"
+AromaLadyPalette:		 INCLUDE "gfx/trainers/aroma_lady.pal"
+RosePalette:			 INCLUDE "gfx/trainers/rose.pal"
+LilyPalette:			 INCLUDE "gfx/trainers/lily.pal"
+IrisPalette:			 INCLUDE "gfx/trainers/iris.pal"
+PoppyPalette:			 INCLUDE "gfx/trainers/poppy.pal"
+FeliciaPalette:			 INCLUDE "gfx/trainers/felicia.pal"
+VioletPalette:			 INCLUDE "gfx/trainers/violet.pal"
+CloverPalette:			 INCLUDE "gfx/trainers/clover.pal"
+TowerTycoonPalette:
 
 
 PlayerPalette:			 INCLUDE "gfx/trainers/player1.pal"

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -4330,6 +4330,105 @@ AromaLadyGroup:
 	db -1 ; end
 
 ; ================
+; ================================
+
+RoseGroup:
+; ================================
+; ================
+
+	; ROSE
+	db "ROSE@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+LilyGroup:
+; ================================
+; ================
+
+	; LILY
+	db "LILY@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+IrisGroup:
+; ================================
+; ================
+
+	; IRIS
+	db "IRIS@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+PoppyGroup:
+; ================================
+; ================
+
+	; POPPY
+	db "POPPY@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+FeliciaGroup:
+; ================================
+; ================
+
+	; FELICIA
+	db "FELICIA@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+VioletGroup:
+; ================================
+; ================
+
+	; VIOLET
+	db "VIOLET@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
+
+CloverGroup:
+; ================================
+; ================
+
+	; CLOVER
+	db "CLOVER@"
+	db TRAINERTYPE_NORMAL
+	; party
+	db 1, BULBASAUR
+	db -1 ; end
+
+; ================
+; ================================
 
 TowerTycoonGroup:
 ; ================================

diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
@@ -80,4 +80,11 @@ TrainerGroups: ; 0x39999
 	dba SpaTrainerGroup
 	dba SpaTrainerFGroup
 	dba AromaLadyGroup
+	dba RoseGroup
+	dba LilyGroup
+	dba IrisGroup
+	dba PoppyGroup
+	dba FeliciaGroup
+	dba VioletGroup
+	dba CloverGroup
 	dba TowerTycoonGroup
diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm
@@ -78,5 +78,12 @@ TrainerPicPointers::
 	dba SpaTrainerPic
 	dba SpaTrainerFPic
 	dba AromaLadyPic
+	dba RosePic
+	dba LilyPic
+	dba IrisPic
+	dba PoppyPic
+	dba FeliciaPic
+	dba VioletPic
+	dba CloverPic
 	dba TowerTycoonPic
 	
diff --git a/data/trainers/sprites.asm b/data/trainers/sprites.asm
@@ -78,4 +78,11 @@ BTTrainerClassSprites:
 	db SPRITE_GOLD         ; SpaTrainer
 	db SPRITE_GOLD         ; SpaTrainerF
 	db SPRITE_AROMA_LADY   ; AromaLady
+	db SPRITE_PIGTAILS	   ; Rose
+	db SPRITE_PIGTAILS	   ; Lily
+	db SPRITE_PIGTAILS	   ; Iris
+	db SPRITE_PIGTAILS	   ; Poppy
+	db SPRITE_PIGTAILS	   ; Felicia
+	db SPRITE_PIGTAILS	   ; Violet
+	db SPRITE_PIGTAILS	   ; Clover
 	db SPRITE_GOLD         ; TOWERTYCOON
diff --git a/gfx/pics.asm b/gfx/pics.asm
@@ -785,6 +785,13 @@ LockePic:				  INCBIN "gfx/trainers/locke.2bpp.lz"
 SpaTrainerPic:			  INCBIN "gfx/trainers/spa_trainer.2bpp.lz"
 SpaTrainerFPic:			  INCBIN "gfx/trainers/spa_trainer_f.2bpp.lz"
 AromaLadyPic:			  INCBIN "gfx/trainers/aroma_lady.2bpp.lz"
+RosePic:
+LilyPic:
+IrisPic:
+PoppyPic:
+FeliciaPic:
+VioletPic:
+CloverPic:				  INCBIN "gfx/trainers/pigtails.2bpp.lz"
 TowerTycoonPic:
 CoryPic:				  INCBIN "gfx/trainers/cory.2bpp.lz"
 CoraPic:				  INCBIN "gfx/trainers/cora.2bpp.lz"

diff --git a/gfx/trainers/clover.pal b/gfx/trainers/clover.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 21, 13
+	RGB 00, 18, 07
+
diff --git a/gfx/trainers/felicia.pal b/gfx/trainers/felicia.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 19, 11
+	RGB 04, 17, 19
+
diff --git a/gfx/trainers/iris.pal b/gfx/trainers/iris.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 19, 11
+	RGB 03, 06, 31
+
diff --git a/gfx/trainers/lily.pal b/gfx/trainers/lily.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 19, 11
+	RGB 28, 03, 21
+
diff --git a/gfx/trainers/pigtails.2bpp b/gfx/trainers/pigtails.2bpp
diff --git a/gfx/trainers/pigtails.2bpp.lz b/gfx/trainers/pigtails.2bpp.lz
diff --git a/gfx/trainers/pigtails.png b/gfx/trainers/pigtails.png
diff --git a/gfx/trainers/poppy.pal b/gfx/trainers/poppy.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 19, 11
+	RGB 16, 09, 05
+
diff --git a/gfx/trainers/rose.pal b/gfx/trainers/rose.pal
@@ -0,0 +1,4 @@
+
+	RGB 31, 21, 13
+	RGB 29, 06, 07
+