Added Kris

m4-used-rollout · m4-used-rollout · commit e036fddbc5c9 · 2025-01-25T22:55:42.000-05:00
diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm
@@ -83,7 +83,9 @@ PlayBattleMusic::
 	cp OPP_PROF_OAK ; could also use the final battle theme, but I think the elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked.
 	jr z, .Elite4Battle 
 	cp OPP_RIVAL3
-	jr z, .finalBattle  
+	jr z, .finalBattle 
+	cp OPP_KRIS
+	jr z, .finalBattle 
 	jr nz, .normalTrainerBattle
 .GymBattle
 	ld a, MUSIC_GYM_LEADER_BATTLE
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
@@ -33,7 +33,7 @@
 	const SPRITE_MIDDLE_AGED_WOMAN       ; $1c
 	const SPRITE_BRUNETTE_GIRL           ; $1d
 	const SPRITE_LANCE                   ; $1e
-	const SPRITE_UNUSED_RED_1            ; $1f
+	const SPRITE_KRIS                    ; $1f
 	const SPRITE_SCIENTIST               ; $20
 	const SPRITE_ROCKER                  ; $21
 	const SPRITE_SWIMMER                 ; $22
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -61,11 +61,12 @@ ENDM
 	trainer_const CHANNELER      ; $2D
 	trainer_const AGATHA         ; $2E
 	trainer_const LANCE          ; $2F
-	trainer_const YUJIROU 		 ; $0D, was unused juggler, also not 0D but I can't be bothered to change everything
-	trainer_const STUDENT
-	trainer_const FIREFIGHTER
-	trainer_const KOICHI
-	trainer_const JACK
-	trainer_const JESSIE_JAMES
-	trainer_const LEADER_GIOVANNI
+	trainer_const YUJIROU 		 ; $30
+	trainer_const STUDENT        ; $31
+	trainer_const FIREFIGHTER    ; $32
+	trainer_const KOICHI         ; $33
+	trainer_const JACK           ; $34
+	trainer_const JESSIE_JAMES   ; $35
+	trainer_const LEADER_GIOVANNI; $36
+	trainer_const KRIS           ; $37
 DEF NUM_TRAINERS EQU const_value - 1
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
@@ -38,7 +38,7 @@ SpriteSheetPointerTable:
 	overworld_sprite MiddleAgedWomanSprite, 12  ; SPRITE_MIDDLE_AGED_WOMAN
 	overworld_sprite BrunetteGirlSprite, 12     ; SPRITE_BRUNETTE_GIRL
 	overworld_sprite LanceSprite, 12            ; SPRITE_LANCE
-	overworld_sprite RedSprite, 12              ; SPRITE_UNUSED_RED_1
+	overworld_sprite KrisSprite, 12             ; SPRITE_KRIS
 	overworld_sprite ScientistSprite, 12        ; SPRITE_SCIENTIST
 	overworld_sprite RockerSprite, 12           ; SPRITE_ROCKER
 	overworld_sprite SwimmerSprite, 12          ; SPRITE_SWIMMER
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
@@ -57,4 +57,5 @@ TrainerAIPointers:
 	dbw 2, BlackbeltAI ; Jack
 	dbw 2, GenericAI ; Jessie & James
 	dbw 3, SabrinaAI
+	dbw 3, SabrinaAI ; Kris
 	assert_table_length NUM_TRAINERS
diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm
@@ -6,6 +6,7 @@ FemaleTrainerList::
 	db OPP_MISTY
 	db OPP_ERIKA
 	db OPP_STUDENT
+	db OPP_KRIS
 	db -1 ; end
 
 EvilTrainerList::
diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm
@@ -62,4 +62,5 @@ TrainerClassMoveChoiceModifications:
 	move_choices 1, 2, 3, 4 ; JACK
 	move_choices 1, 3,   ; JESSIE_JAMES
 	move_choices 1, 2, 3, 4 ; LEADER_GIOVANNI
+	move_choices 1, 2, 3, 4 ; KRIS
 	assert_list_length NUM_TRAINERS
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
@@ -53,4 +53,5 @@ TrainerNames::
 	li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky".
 	li "JESSIE&JAMES"
 	li "GIOVANNI"
+	li "KRIS"
 	assert_list_length NUM_TRAINERS
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -53,6 +53,7 @@ TrainerDataPointers:
 	dw JackData
 	dw JessieJamesData
 	dw LeaderGiovanniData
+	dw KrisData
 	assert_table_length NUM_TRAINERS
 
 ; if first byte != $FF, then
diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm
@@ -60,4 +60,5 @@ TrainerPicAndMoneyPointers::
 	pic_money JackPic,         5000
 	pic_money JessieJamesPic,  5000
 	pic_money GiovanniPic2,    9900
+	pic_money KrisPic,         9900
 	assert_table_length NUM_TRAINERS
diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm
@@ -137,3 +137,6 @@ KoichiData:
 	db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
 	db $FF, 50, MACHAMP, 50, CARAPTHOR, 50, ANNIHILAPE, 53, HITMONLEE, 53, HITMONCHAN, 53, HITMONTOP, 0 ; 8
 	db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame
+
+KrisData:
+	db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0 ; Misty's party for now
diff --git a/gfx/pics.asm b/gfx/pics.asm
@@ -588,11 +588,12 @@ SirfetchdPicBack::     INCBIN "gfx/pokemon/back/sirfetchdb.pic"
 GorillaimoPicFront::   INCBIN "gfx/pokemon/front/gorillaimo.pic"
 GorillaimoPicBack::    INCBIN "gfx/pokemon/back/gorillaimob.pic"
 
-LancePic::         INCBIN "gfx/trainers/lance.pic"
+LancePic::          INCBIN "gfx/trainers/lance.pic"
 YujirouPic::	    INCBIN "gfx/trainers/yujirou.pic"
 StudentPic::	    INCBIN "gfx/trainers/student.pic"
 FirefighterPic::	INCBIN "gfx/trainers/firefighter.pic"
 KoichiPic::	  	    INCBIN "gfx/trainers/koichi.pic"
 JackPic::		    INCBIN "gfx/trainers/jack.pic"
 JessieJamesPic::	INCBIN "gfx/trainers/jessiejames.pic"
 GiovanniPic2::	    INCBIN "gfx/trainers/giovanni2.pic"
+KrisPic::           INCBIN "gfx/trainers/kris.pic"
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
@@ -103,3 +103,4 @@ LittleBoySprite::        INCBIN "gfx/sprites/little_boy.2bpp"
 GameboyKidSprite::       INCBIN "gfx/sprites/gameboy_kid.2bpp"
 FairySprite::            INCBIN "gfx/sprites/fairy.2bpp"
 AgathaSprite::           INCBIN "gfx/sprites/agatha.2bpp"
+KrisSprite::             INCBIN "gfx/sprites/kris.2bpp"
diff --git a/gfx/sprites/kris.png b/gfx/sprites/kris.png
diff --git a/gfx/trainers/kris.png b/gfx/trainers/kris.png
