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

HGSS-style first rival fight

Browse source 
Now the rival doesn't awkwardly say his name is ???, using the trainer card from HGSS instead. Includes the funny lookaround gaffe among other bits. Changed the trainer class as well, making it seamless.
This commit is contained in:
Llinos Evans 2024-07-29 15:30:04 +01:00
parent a4044f0929
commit d55f848761
13 changed files with 99 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/trainers/attributes.asm
View file

@ -50,6 +50,12 @@ TrainerClassAttributes:
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
; Passerby
db NO_ITEM, NO_ITEM ; items
db 15 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
; Rival1
db NO_ITEM, NO_ITEM ; items
db 15 ; base reward

1
data/trainers/class_names.asm
View file

@ -9,6 +9,7 @@ TrainerClassNames::
li "LEADER"
li "LEADER"
li "LEADER"
li "PASSERBY" ; HGSS implementation
li "RIVAL"
li "#MON PROF."
li "ELITE FOUR"

1
data/trainers/dvs.asm
View file

@ -10,6 +10,7 @@ TrainerClassDVs:
dn 9, 8, 8, 8 ; JASMINE
dn 9, 8, 8, 8 ; CHUCK
dn 7, 12, 13, 13 ; CLAIR
dn 13, 13, 13, 13 ; PASSERBY
dn 13, 13, 13, 13 ; RIVAL1
dn 9, 8, 8, 8 ; POKEMON_PROF
dn 13, 12, 13, 13 ; WILL

1
data/trainers/encounter_music.asm
View file

@ -12,6 +12,7 @@ TrainerEncounterMusic::
db MUSIC_LASS_ENCOUNTER ; jasmine
db MUSIC_OFFICER_ENCOUNTER ; chuck
db MUSIC_BEAUTY_ENCOUNTER ; clair
db MUSIC_RIVAL_ENCOUNTER ; passerby
db MUSIC_RIVAL_ENCOUNTER ; rival1
db MUSIC_HIKER_ENCOUNTER ; pokemon_prof
db MUSIC_HIKER_ENCOUNTER ; will

1
data/trainers/genders.asm
View file

@ -11,6 +11,7 @@ BTTrainerClassGenders:
db FEMALE ; JASMINE
db MALE ; CHUCK
db FEMALE ; CLAIR
db MALE ; PASSERBY
db MALE ; RIVAL1
db MALE ; POKEMON_PROF
db FEMALE ; WILL

1
data/trainers/palettes.asm
View file

@ -18,6 +18,7 @@ INCBIN "gfx/trainers/pryce.gbcpal", middle_colors
INCBIN "gfx/trainers/jasmine.gbcpal", middle_colors
INCBIN "gfx/trainers/chuck.gbcpal", middle_colors
INCBIN "gfx/trainers/clair.gbcpal", middle_colors
INCBIN "gfx/trainers/rival1.gbcpal", middle_colors ; clone for the passerby class
INCBIN "gfx/trainers/rival1.gbcpal", middle_colors
INCBIN "gfx/trainers/oak.gbcpal", middle_colors
INCBIN "gfx/trainers/will.gbcpal", middle_colors

10
data/trainers/parties.asm
View file

@ -158,25 +158,27 @@ ClairGroup:
end_list_items
Rival1Group:
PasserbyGroup:
next_list_item ; RIVAL1 (1)
db "?@", TRAINERTYPE_NORMAL
db "BOY@", TRAINERTYPE_NORMAL
db 5
dw CHIKORITA
db -1 ; end
next_list_item ; RIVAL1 (2)
db "?@", TRAINERTYPE_NORMAL
db "BOY@", TRAINERTYPE_NORMAL
db 5
dw CYNDAQUIL
db -1 ; end
next_list_item ; RIVAL1 (3)
db "?@", TRAINERTYPE_NORMAL
db "BOY@", TRAINERTYPE_NORMAL
db 5
dw TOTODILE
db -1 ; end
end_list_items
Rival1Group:
next_list_item ; RIVAL1 (4)
db "?@", TRAINERTYPE_NORMAL
db 12

1
data/trainers/party_pointers.asm
View file

@ -11,6 +11,7 @@ TrainerGroups:
dba JasmineGroup
dba ChuckGroup
dba ClairGroup
dba PasserbyGroup
dba Rival1Group
dba PokemonProfGroup
dba WillGroup

1
data/trainers/pic_pointers.asm
View file

@ -11,6 +11,7 @@ TrainerPicPointers::
dba JasminePic
dba ChuckPic
dba ClairPic
dba PasserbyPic
dba Rival1Pic
dba PokemonProfPic
dba WillPic

1
data/trainers/sprites.asm
View file

@ -10,6 +10,7 @@ BTTrainerClassSprites:
db SPRITE_CHUCK
db SPRITE_CLAIR
db SPRITE_RIVAL
db SPRITE_RIVAL
db SPRITE_OAK
db SPRITE_WILL
db SPRITE_CHRIS