thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-12-29 22:03:16 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/trainer_constants.asm
View file

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

12
data/trainers/attributes.asm
View file

@ -463,5 +463,17 @@ TrainerClassAttributes:
db 10 ; base reward db 10 ; base reward
dw AI_BASIC | AI_CAUTIOUS | AI_STATUS dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
dw CONTEXT_USE | SWITCH_SOMETIMES 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 assert_table_length NUM_TRAINER_CLASSES

2
data/trainers/class_names.asm
View file

@ -78,4 +78,6 @@ TrainerClassNames::
li "PAINTER" li "PAINTER"
li "SOLDIER" li "SOLDIER"
li "SPORTSMAN" li "SPORTSMAN"
li "???"
li "???"
assert_list_length NUM_TRAINER_CLASSES 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 ; PAINTER
dn 9, 8, 8, 8 ; SOLDIER dn 9, 8, 8, 8 ; SOLDIER
dn 9, 8, 8, 8 ; SPORTSMAN dn 9, 8, 8, 8 ; SPORTSMAN
dn 15, 15, 15, 15 ; FOSSIL1
dn 15, 15, 15, 15 ; FOSSIL2
assert_table_length NUM_TRAINER_CLASSES 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_LASS_ENCOUNTER ; painter
db MUSIC_HIKER_ENCOUNTER ; soldier db MUSIC_HIKER_ENCOUNTER ; soldier
db MUSIC_HIKER_ENCOUNTER ; sportsman db MUSIC_HIKER_ENCOUNTER ; sportsman
db MUSIC_ROCKET_ENCOUNTER ; fossil1
db MUSIC_ROCKET_ENCOUNTER ; fossil2
assert_table_length NUM_TRAINER_CLASSES + 1 assert_table_length NUM_TRAINER_CLASSES + 1

2
data/trainers/gendered_trainers.asm
View file

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

2
data/trainers/genders.asm
View file

@ -80,4 +80,6 @@ BTTrainerClassGenders:
db FEMALE ; PAINTER db FEMALE ; PAINTER
db MALE ; SOLDIER db MALE ; SOLDIER
db MALE ; SPORTSMAN db MALE ; SPORTSMAN
db MALE ; FOSSIL
db FEMALE ; FOSSIL
assert_table_length NUM_TRAINER_CLASSES 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/painter.gbcpal", middle_colors
INCBIN "gfx/trainers/soldier.gbcpal", middle_colors INCBIN "gfx/trainers/soldier.gbcpal", middle_colors
INCBIN "gfx/trainers/sportsman.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: EnbyPalette:
INCLUDE "gfx/player/topaz.pal" INCLUDE "gfx/player/topaz.pal"

16
data/trainers/parties.asm
View file

@ -5482,3 +5482,19 @@ SportsmanGroup:
dw DODUO dw DODUO
db -1 ; end db -1 ; end
end_list_items 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 PainterGroup
dba SoldierGroup dba SoldierGroup
dba SportsmanGroup dba SportsmanGroup
dba AerofossilGroup
dba KabufossilGroup
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

2
data/trainers/pic_pointers.asm
View file

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

2
data/trainers/sprites.asm
View file

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

18
engine/events/pokepic.asm
View file

@ -13,6 +13,7 @@ Pokepic::
call GetBaseData call GetBaseData
ld de, vTiles1 ld de, vTiles1
predef GetMonFrontpic predef GetMonFrontpic
_Displaypic:
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]
inc a inc a
ld b, a ld b, a
@ -26,7 +27,22 @@ Pokepic::
predef PlaceGraphic predef PlaceGraphic
call WaitBGMap call WaitBGMap
ret 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:: ClosePokepic::
ld hl, PokepicMenuHeader ld hl, PokepicMenuHeader
call CopyMenuHeader call CopyMenuHeader

11
engine/overworld/scripting.asm
View file

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

4
gfx/pics.asm
View file

@ -1026,4 +1026,6 @@ FeradactylBackpic: INCBIN "gfx/pokemon/feradactyl/back.2bpp.lz"
DecillaFrontpic: INCBIN "gfx/pokemon/decilla/front.animated.2bpp.lz" DecillaFrontpic: INCBIN "gfx/pokemon/decilla/front.animated.2bpp.lz"
DecillaBackpic: INCBIN "gfx/pokemon/decilla/back.2bpp.lz" DecillaBackpic: INCBIN "gfx/pokemon/decilla/back.2bpp.lz"
GawarhedFrontpic: INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz" GawarhedFrontpic: INCBIN "gfx/pokemon/elebebi/front.animated.2bpp.lz"
GawarhedBackpic: INCBIN "gfx/pokemon/gawarhed/back.2bpp.lz" GawarhedBackpic: INCBIN "gfx/pokemon/gawarhed/back.2bpp.lz"
KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz"
AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz"

BIN
gfx/trainers/aerodactyl.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 614 B

BIN
gfx/trainers/kabutops.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 537 B

10
macros/scripts/events.asm
View file

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

4
maps/PewterMuseumOfScience1F.asm
View file

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