thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-20 22:48:43 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

The Great Trainer Overhaul (Part 2)... and...?

Browse source 
Finishes the trainers of Johto, and a little something extra ;3
This commit is contained in:
Misty 2025-10-25 16:05:42 -06:00
parent 429b390f3b
commit bb3fc104f8
34 changed files with 907 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/pokemon/base_stats.asm
View file

@ -454,4 +454,5 @@ INCLUDE "data/pokemon/base_stats/ho_oh.asm"
INCLUDE "data/pokemon/base_stats/hyoshu_yang.asm"
INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm"
INCLUDE "data/pokemon/base_stats/celebi.asm"
INCLUDE "data/pokemon/base_stats/deoxys.asm"
.IndirectEnd::

21
data/pokemon/base_stats/deoxys.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 50, 150, 50, 150, 150, 50
; hp atk def spd sat sdf
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 3 ; catch rate
db 215 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 120 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/deoxys/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups
; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, CUT, STRENGTH, FLASH, ICE_BEAM, THUNDERBOLT
; end

1
data/pokemon/cries.asm
View file

@ -433,4 +433,5 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YANG (placeholder)
mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YIN (placeholder)
mon_cry CRY_ENTEI, 330, 273 ; CELEBI
mon_cry CRY_NIDORAN_M, 0, 0 ; DEOXYS (incomplete)
assert_table_length NUM_POKEMON

1
data/pokemon/dex_entries.asm
View file

@ -442,3 +442,4 @@ MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm"
GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm"
BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm"
EvolottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/evolotto.asm"
DeoxysPokedexEntry:: INCLUDE "data/pokemon/dex_entries/deoxys.asm"

10
data/pokemon/dex_entries/deoxys.asm Normal file
View file

@ -0,0 +1,10 @@
db "DNA@" ; species name
dw 507, 1340 ; height, weight
db "Born from a"
next "mutated space"
next "virus, the crystal"
db "in DEOXYS' chest"
next "is actually its"
next "brain.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -428,4 +428,5 @@ PokedexDataPointerTable:
dba HyoshuYangPokedexEntry
dba HyoshuYinPokedexEntry
dba CelebiPokedexEntry
dba DeoxysPokedexEntry
assert_table_length NUM_POKEMON

1
data/pokemon/dex_order_alpha.asm
View file

@ -74,6 +74,7 @@ AlphabeticalPokedexOrder:
dw CYNDAQUIL
dw DECILLA
dw DELIBIRD
dw DEOXYS
dw DEWGONG
dw DIGLETT
dw DISTURBAN

1
data/pokemon/dex_order_new.asm
View file

@ -429,4 +429,5 @@ NewPokedexOrder:
dw MELTAN
dw MELMETAL
dw CELEBI
dw DEOXYS
assert_table_length NUM_POKEMON

1
data/pokemon/egg_moves_johto.asm
View file

@ -203,6 +203,7 @@ EggMovePointers2::
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2 ; Deoxys
.IndirectEnd::
ChikoritaEggMoves:

30
data/pokemon/evos_attacks_johto.asm
View file

@ -202,6 +202,7 @@ EvosAttacksPointers2::
dw HyoshuYangEvosAttacks
dw HyoshuYinEvosAttacks
dw CelebiEvosAttacks
dw DeoxysEvosAttacks
.IndirectEnd::
ChikoritaEvosAttacks:
@ -1021,8 +1022,8 @@ HoppipEvosAttacks:
dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER
dbw 22, LEECH_SEED
dbw 25, SLAM ; SW97
dbw 30, MEGA_DRAIN
dbw 25, MEGA_DRAIN
dbw 30, SLAM ; SW97
dbw 35, GROWTH ; SW97
dbw 39, RAZOR_LEAF ; SW97
dbw 45, COTTON_SPORE
@ -1042,8 +1043,8 @@ SkiploomEvosAttacks:
dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER
dbw 24, LEECH_SEED
dbw 27, SLAM ; SW97
dbw 32, MEGA_DRAIN
dbw 27, MEGA_DRAIN
dbw 32, SLAM ; SW97
dbw 39, GROWTH ; SW97
dbw 43, RAZOR_LEAF ; SW97
dbw 49, COTTON_SPORE
@ -1062,8 +1063,8 @@ JumpluffEvosAttacks:
dbw 17, STUN_SPORE
dbw 18, SLEEP_POWDER
dbw 24, LEECH_SEED
dbw 27, SLAM ; SW97
dbw 34, MEGA_DRAIN
dbw 27, MEGA_DRAIN
dbw 34, SLAM ; SW97
dbw 41, GROWTH ; SW97
dbw 47, RAZOR_LEAF ; SW97
dbw 53, COTTON_SPORE
@ -3458,3 +3459,20 @@ CelebiEvosAttacks:
dbw 40, BATON_PASS
dbw 50, PERISH_SONG
db 0 ; no more level-up moves
DeoxysEvosAttacks:
db 0 ; no more evolutions
dbw 1, LEER
dbw 1, WRAP
dbw 9, NIGHT_SHADE
dbw 17, TELEPORT
dbw 25, CONFUSION
dbw 33, PURSUIT
dbw 41, PSYBEAM
dbw 49, COMET_PUNCH
dbw 57, PSYCHIC_M
dbw 65, SAFEGUARD
dbw 73, RECOVER
dbw 81, FUTURE_SIGHT
dbw 89, HYPER_BEAM
db 0 ; no more level-up moves

5
data/pokemon/evos_attacks_kanto.asm
View file

@ -2386,10 +2386,11 @@ KinglerEvosAttacks:
dbw 53, FLAIL ; FRLG
db 0 ; no more level-up moves
VoltorbEvosAttacks: ; spark and twave should be here somewhere
VoltorbEvosAttacks:
dbbw EVOLVE_LEVEL, 30, ELECTRODE
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, THUNDERSHOCK
dbw 7, SCREECH
dbw 12, THUNDER_WAVE ; SW97
dbw 17, SONICBOOM
@ -2406,6 +2407,7 @@ VoltorbEvosAttacks: ; spark and twave should be here somewhere
ElectrodeEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, THUNDERSHOCK
dbw 7, SCREECH
dbw 12, THUNDER_WAVE ; SW97
dbw 17, SONICBOOM
@ -3350,6 +3352,7 @@ EeveeEvosAttacks:
dbw 36, BATON_PASS
dbw 42, TAKE_DOWN
dbw 47, FOCUS_ENERGY ; RBY, GS
dbw 52, SWIFT ; LGPE
db 0 ; no more level-up moves
VaporeonEvosAttacks:

1
data/pokemon/first_stages.asm
View file

@ -428,4 +428,5 @@ FirstEvoStages::
dw HYOSHU_YANG
dw HYOSHU_YIN
dw CELEBI
dw DEOXYS
assert_table_length NUM_POKEMON

1
data/pokemon/menu_icons.asm
View file

@ -429,4 +429,5 @@ MonMenuIcons:
db ICON_FOX ; HYOSHU_YANG
db ICON_FOX ; HYOSHU_YIN
db ICON_HUMANSHAPE ; CELEBI
db ICON_HUMANSHAPE ; DEOXYS
assert_table_length NUM_POKEMON

1
data/pokemon/names.asm
View file

@ -432,4 +432,5 @@ PokemonNames::
db "HYOSHU@@@@"
db "HYOSHU@@@@"
db "CELEBI@@@@"
db "DEOXYS@@@@"
assert_table_length NUM_POKEMON

2
data/pokemon/palettes.asm
View file

@ -890,6 +890,8 @@ INCBIN "gfx/pokemon/hyoshu_yin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/hyoshu_yin/shiny.pal"
INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/celebi/shiny.pal"
INCBIN "gfx/pokemon/deoxys/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/deoxys/shiny.pal"
assert_table_length NUM_POKEMON + 1

2
data/pokemon/pic_pointers.asm
View file

@ -870,4 +870,6 @@ PokemonPicPointers::
dba HyoshuYinBackpic
dba CelebiFrontpic
dba CelebiBackpic
dba DeoxysFrontpic
dba DeoxysBackpic
assert_table_length NUM_POKEMON + 1

1337
data/trainers/parties.asm
View file

File diff suppressed because it is too large Load diff

30
data/trainers/parties_new_classes.asm
View file

@ -668,15 +668,19 @@ KurtGroup:
ArcherGroup:
next_list_item
db "ARCHER@", TRAINERTYPE_NORMAL
db 33
db "ARCHER@", TRAINERTYPE_MOVES
db 42
dw ELECTRODE
db 33
dw THUNDER, ROLLOUT, THUNDER_WAVE, EXPLOSION
db 43
dw MAGMAR
db 33
dw FLAMETHROWER, FAINT_ATTACK, SMOKESCREEN, CONFUSE_RAY
db 43
dw GOLBAT
db 35
dw WING_ATTACK, THRASH, SCREECH, MEAN_LOOK
db 45
dw HOUNDOOM
dw FIRE_BLAST, FAINT_ATTACK, SLUDGE_BOMB, SCARY_FACE
db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL
@ -858,20 +862,20 @@ TwinsGroup:
next_list_item ; TWINS (9)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 35
db 43
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db 35
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db 43
dw SQUEAMATA
dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES
db -1 ; end
next_list_item ; TWINS (10)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 38
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db 38
db 43
dw SQUEAMATA
dw GLARE, DRAGONBREATH, ICE_BEAM, FURY_SWIPES
db 43
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end