Trainerpic command and Fossils

constants/trainer_constants.asm

@@ -741,5 +741,11 @@ DEF KRIS EQU __trainer_class__
 	trainerclass SPORTSMAN ; 53
 	const JACQUES ; also an ace attorney reference.
 	
+	trainerclass AEROFOSSIL ; 54
+	const FOSSIL1
+	
+	trainerclass KABUFOSSIL ; 55
+	const FOSSIL2
+
 DEF TOPAZ EQU __trainer_class__
 DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1

data/trainers/attributes.asm

@@ -464,4 +464,16 @@ TrainerClassAttributes:
 	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
 	dw CONTEXT_USE | SWITCH_SOMETIMES
 	
+; FOSSIL1
+	db NO_ITEM, NO_ITEM ; items
+	db 99 ; base reward
+	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_RARELY
+	
+; FOSSIL2
+	db NO_ITEM, NO_ITEM ; items
+	db 99 ; base reward
+	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_RARELY
+
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/class_names.asm

@@ -78,4 +78,6 @@ TrainerClassNames::
 	li "PAINTER"
 	li "SOLDIER"
 	li "SPORTSMAN"
+	li "???"
+	li "???"
 	assert_list_length NUM_TRAINER_CLASSES

data/trainers/dvs.asm

@@ -79,4 +79,6 @@ TrainerClassDVs:
 	dn  9,  8,  8,  8 ; PAINTER
 	dn  9,  8,  8,  8 ; SOLDIER
 	dn  9,  8,  8,  8 ; SPORTSMAN
+	dn 15, 15, 15, 15 ; FOSSIL1
+	dn 15, 15, 15, 15 ; FOSSIL2
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/encounter_music.asm

@@ -81,4 +81,6 @@ TrainerEncounterMusic::
 	db MUSIC_LASS_ENCOUNTER			; painter
 	db MUSIC_HIKER_ENCOUNTER		; soldier
 	db MUSIC_HIKER_ENCOUNTER		; sportsman
+	db MUSIC_ROCKET_ENCOUNTER      ; fossil1
+	db MUSIC_ROCKET_ENCOUNTER      ; fossil2
 	assert_table_length NUM_TRAINER_CLASSES + 1

data/trainers/gendered_trainers.asm

@@ -35,6 +35,7 @@ MaleTrainers:
 	db TEACHERM
 	db SOLDIER
 	db SPORTSMAN
+	db AEROFOSSIL
 .End
 
 FemaleTrainers:
@@ -50,4 +51,5 @@ FemaleTrainers:
 	db COOLTRAINERF
 	db CHANNELER
 	db PAINTER
+	db KABUFOSSIL
 .End

data/trainers/genders.asm

@@ -80,4 +80,6 @@ BTTrainerClassGenders:
 	db FEMALE ; PAINTER
 	db MALE ; SOLDIER
 	db MALE ; SPORTSMAN
+	db MALE ; FOSSIL
+	db FEMALE ; FOSSIL
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/palettes.asm

@@ -87,6 +87,8 @@ INCBIN "gfx/trainers/teacherm.gbcpal", middle_colors
 INCBIN "gfx/trainers/painter.gbcpal", middle_colors
 INCBIN "gfx/trainers/soldier.gbcpal", middle_colors
 INCBIN "gfx/trainers/sportsman.gbcpal", middle_colors
+INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; duplicate for fossils
+INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; duplicate for fossils
 
 EnbyPalette:
 INCLUDE "gfx/player/topaz.pal"

data/trainers/parties.asm

@@ -5482,3 +5482,19 @@ SportsmanGroup:
 	dw DODUO
 	db -1 ; end
 	end_list_items
+	
+AerofossilGroup:
+	next_list_item ; SPORTSMAN (1)
+	db "???@", TRAINERTYPE_NORMAL
+	db 99
+	dw AERODACTYL
+	db -1 ; end
+	end_list_items
+
+KabufossilGroup:
+	next_list_item ; SPORTSMAN (1)
+	db "???@", TRAINERTYPE_NORMAL
+	db 99
+	dw KABUTOPS
+	db -1 ; end
+	end_list_items

data/trainers/party_pointers.asm

@@ -80,4 +80,6 @@ TrainerGroups:
 	dba PainterGroup
 	dba SoldierGroup
 	dba SportsmanGroup
+	dba AerofossilGroup
+	dba KabufossilGroup
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/pic_pointers.asm

@@ -80,4 +80,6 @@ TrainerPicPointers::
 	dba PainterPic
 	dba SoldierPic
 	dba SportsmanPic
+	dba AerodactylFossilPic
+	dba KabutopsFossilPic
 	assert_table_length NUM_TRAINER_CLASSES

data/trainers/sprites.asm

@@ -78,4 +78,6 @@ BTTrainerClassSprites:
 	db SPRITE_LASS		; Painter
 	db SPRITE_ROCKER	; Soldier
 	db SPRITE_SAILOR	; Sportsman uhhh
+	db SPRITE_RED		; Fossil Placeholder
+	db SPRITE_RED		; Fossil Placeholder
 	assert_table_length NUM_TRAINER_CLASSES

engine/events/pokepic.asm

@@ -13,6 +13,7 @@ Pokepic::
 	call GetBaseData
 	ld de, vTiles1
 	predef GetMonFrontpic
+_Displaypic:
 	ld a, [wMenuBorderTopCoord]
 	inc a
 	ld b, a
@@ -27,6 +28,21 @@ Pokepic::
 	call WaitBGMap
 	ret
 	
+Trainerpic::
+	ld hl, PokepicMenuHeader
+	call CopyMenuHeader
+	call MenuBox
+	call UpdateSprites
+	call ApplyTilemap
+	ld b, SCGB_POKEPIC
+	call GetSGBLayout
+	xor a
+	ldh [hBGMapMode], a
+	ld a, [wTrainerClass]
+	ld de, vTiles1
+	predef GetTrainerPic
+	jr _Displaypic
+	
 ClosePokepic::
 	ld hl, PokepicMenuHeader
 	call CopyMenuHeader

engine/overworld/scripting.asm

@@ -234,8 +234,9 @@ ScriptCommandTable:
 	dw Script_getname                    ; a7
 	dw Script_wait                       ; a8
 	dw Script_checksave                  ; a9
-	dw Script_loadmonindex               ; aa
+	dw Script_trainerpic				 ; aa
-	dw Script_checkmaplockedmons         ; ab
+	dw Script_loadmonindex               ; ab
+	dw Script_checkmaplockedmons         ; ac
 	assert_table_length NUM_EVENT_COMMANDS
 
 StartScript:
@@ -2348,6 +2349,12 @@ Script_checkver_duplicate: ; unreferenced
 .gs_version:
 	db GS_VERSION
 
+Script_trainerpic:
+	call GetScriptByte
+	ld [wTrainerClass], a
+	farcall Trainerpic
+	ret
+
 Script_loadmonindex:
 ; script command 0xaa
 	call LoadScriptPokemonID

gfx/pics.asm

@@ -1027,3 +1027,5 @@ DecillaFrontpic:     INCBIN "gfx/pokemon/decilla/front.animated.2bpp.lz"
 DecillaBackpic:      INCBIN "gfx/pokemon/decilla/back.2bpp.lz"
 GawarhedFrontpic:    INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz"
 GawarhedBackpic:     INCBIN "gfx/pokemon/gawarhed/back.2bpp.lz"
+KabutopsFossilPic:   INCBIN "gfx/trainers/kabutops.2bpp.lz"
+AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz"

macros/scripts/events.asm

@@ -1065,14 +1065,20 @@ MACRO checksave
 	db checksave_command
 ENDM
 
-	const loadmonindex_command ; $aa
+	const trainerpic_command ; $aa
+MACRO trainerpic
+	db trainerpic_command
+	db \1 ; trainer
+ENDM
+
+	const loadmonindex_command ; $ab
 MACRO loadmonindex
 	db loadmonindex_command
 	dw \2 ; pokemon
 	db \1 ; 0: don't reserve, 1-8: reserve in specific spot
 ENDM
 
-	const checkmaplockedmons_command ; $ab
+	const checkmaplockedmons_command ; $ac
 MACRO checkmaplockedmons
 	db checkmaplockedmons_command
 ENDM

maps/PewterMuseumOfScience1F.asm

@@ -508,7 +508,7 @@ AerodactylFossilScript:
 	writetext AerodactylFossilText
 	waitbutton
 	refreshscreen
-	pokepic EGG
+	trainerpic AEROFOSSIL
 	cry AERODACTYL
 	waitbutton
 	closepokepic
@@ -527,7 +527,7 @@ KabutopsFossilScript:
 	writetext KabutopsFossilText
 	waitbutton
 	refreshscreen
-	pokepic KABUTOPS
+	trainerpic KABUFOSSIL
 	cry KABUTOPS
 	waitbutton
 	closepokepic