thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trainerpic command and Fossils

Browse source
This commit is contained in:
Zeta_Null 2024-07-13 15:04:17 -04:00
parent 9a54c174ef
commit 913850d433
19 changed files with 91 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/trainers/attributes.asm
View file

@ -463,5 +463,17 @@ TrainerClassAttributes:
db 10 ; base reward
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

2
data/trainers/class_names.asm
View file

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

2
data/trainers/dvs.asm
View file

@ -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

2
data/trainers/encounter_music.asm
View file

@ -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

2
data/trainers/gendered_trainers.asm
View file

@ -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

2
data/trainers/genders.asm
View file

@ -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

2
data/trainers/palettes.asm
View file

@ -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"

16
data/trainers/parties.asm
View file

@ -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

2
data/trainers/party_pointers.asm
View file

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

2
data/trainers/pic_pointers.asm
View file

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

2
data/trainers/sprites.asm
View file

@ -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