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 1)

Browse source 
It begins. Up to Jasmine.
This commit is contained in:
Misty 2025-08-10 18:18:28 -06:00
parent 79b2a11f85
commit 56198480fd
37 changed files with 503 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/pokemon/base_stats.asm
View file

@ -299,7 +299,7 @@ INCLUDE "data/pokemon/base_stats/sunbud.asm"
INCLUDE "data/pokemon/base_stats/sunflora.asm"
INCLUDE "data/pokemon/base_stats/hippunk.asm"
INCLUDE "data/pokemon/base_stats/aercrow.asm"
INCLUDE "data/pokemon/base_stats/foxfire.asm"
INCLUDE "data/pokemon/base_stats/zorriego.asm"
INCLUDE "data/pokemon/base_stats/yanma.asm"
INCLUDE "data/pokemon/base_stats/yanmega.asm"
INCLUDE "data/pokemon/base_stats/oniyanma.asm"

2
data/pokemon/base_stats/foxfire.asm → data/pokemon/base_stats/zorriego.asm
View file

@ -11,7 +11,7 @@
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/foxfire/front.dimensions"
INCBIN "gfx/pokemon/zorriego/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups

2
data/pokemon/cries.asm
View file

@ -278,7 +278,7 @@ PokemonCries::
mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA
mon_cry CRY_NIDORAN_M, 0, 0 ; HIPPUNK (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; AERCROW (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; FOXFIRE (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; ZORRIEGO (incomplete)
mon_cry CRY_TOTODILE, 49, 200 ; YANMA
mon_cry CRY_NIDORAN_M, 0, 0 ; YANMEGA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; ONIYANMA (incomplete)

2
data/pokemon/dex_entries.asm
View file

@ -268,7 +268,7 @@ SunbudPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunbud.asm"
SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm"
HippunkPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hippunk.asm"
AercrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aercrow.asm"
FoxfirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/foxfire.asm"
ZorriegoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zorriego.asm"
SECTION "Pokedex Entries 193-251", ROMX

0
data/pokemon/dex_entries/foxfire.asm → data/pokemon/dex_entries/zorriego.asm
View file

2
data/pokemon/dex_entry_pointers.asm
View file

@ -273,7 +273,7 @@ PokedexDataPointerTable:
dba SunfloraPokedexEntry
dba HippunkPokedexEntry
dba AercrowPokedexEntry
dba FoxfirePokedexEntry
dba ZorriegoPokedexEntry
dba YanmaPokedexEntry
dba YanmegaPokedexEntry
dba OniyanmaPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -107,7 +107,6 @@ AlphabeticalPokedexOrder:
dw FLUTTER_MANE
dw FOLAGE
dw FORRETRESS
dw FOXFIRE
dw FURRET
dw GASTLY
dw GAOTORA
@ -399,5 +398,6 @@ AlphabeticalPokedexOrder:
dw YANMA
dw YANMEGA
dw ZAPDOS
dw ZORRIEGO
dw ZUBAT
assert_table_length NUM_POKEMON

2
data/pokemon/dex_order_new.asm
View file

@ -225,7 +225,7 @@ NewPokedexOrder:
dw QATU
dw XATU
dw AERCROW
dw FOXFIRE
dw ZORRIEGO
dw QWILFISH
dw KAZAPPELIN
dw QWILFATHER

4
data/pokemon/egg_moves_johto.asm
View file

@ -61,7 +61,7 @@ EggMovePointers2::
dw NoEggMoves2
dw HippunkEggMoves
dw AercrowEggMoves
dw FoxfireEggMoves
dw ZorriegoEggMoves
dw YanmaEggMoves
dw NoEggMoves2 ; Yanmega
dw NoEggMoves2 ; Oniyanma
@ -388,7 +388,7 @@ AercrowEggMoves:
dw WHIRLWIND
dw -1 ; end
FoxfireEggMoves:
ZorriegoEggMoves:
dw CONFUSE_RAY
dw DISABLE
dw FAINT_ATTACK

2
data/pokemon/evolution_moves.asm
View file

@ -271,7 +271,7 @@ EvolutionMoves::
dw NO_MOVE ;SUNFLORA ; c0
dw NO_MOVE ;HIPPUNK
dw NO_MOVE ;AERCROW
dw NO_MOVE ;FOXFIRE
dw NO_MOVE ;ZORRIEGO
dw NO_MOVE ;YANMA ; c1
dw NO_MOVE ;YANMEGA
dw NO_MOVE ;ONIYANMA

4
data/pokemon/evos_attacks_johto.asm
View file

@ -61,7 +61,7 @@ EvosAttacksPointers2::
dw SunfloraEvosAttacks
dw HippunkEvosAttacks
dw AercrowEvosAttacks
dw FoxfireEvosAttacks
dw ZorriegoEvosAttacks
dw YanmaEvosAttacks
dw YanmegaEvosAttacks
dw OniyanmaEvosAttacks
@ -1165,7 +1165,7 @@ AercrowEvosAttacks:
dbw 50, RAZOR_WIND
db 0 ; no more level-up moves
FoxfireEvosAttacks:
ZorriegoEvosAttacks:
db 0; no more evolutions
dbw 1, EMBER
dbw 1, LEER

2
data/pokemon/first_stages.asm
View file

@ -273,7 +273,7 @@ FirstEvoStages::
dw SUNKERN ;c0
dw HIPPUNK
dw AERCROW
dw FOXFIRE
dw ZORRIEGO
dw YANMA
dw YANMA
dw YANMA

2
data/pokemon/menu_icons.asm
View file

@ -274,7 +274,7 @@ MonMenuIcons:
db ICON_ODDISH ; SUNFLORA
db ICON_SLOWPOKE ; HIPPUNK
db ICON_BIRD ; AERCROW
db ICON_FOX ; FOXFIRE
db ICON_FOX ; ZORRIEGO
db ICON_BUG ; YANMA
db ICON_BUG ; YANMEGA
db ICON_BUG ; ONIYANMA

2
data/pokemon/names.asm
View file

@ -276,7 +276,7 @@ PokemonNames::
db "SUNFLORA@@"
db "TORPIR@@@@"
db "AERCROW@@@"
db "FOXFIRE@@@"
db "ZORRIEGO@@"
db "YANMA@@@@@"
db "YANMEGA@@@"
db "ONIYANMA@@"

4
data/pokemon/palettes.asm
View file

@ -577,8 +577,8 @@ INCBIN "gfx/pokemon/hippunk/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/hippunk/shiny.pal"
INCBIN "gfx/pokemon/aercrow/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/aercrow/shiny.pal"
INCBIN "gfx/pokemon/foxfire/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/foxfire/shiny.pal"
INCBIN "gfx/pokemon/zorriego/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/zorriego/shiny.pal"
INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/yanma/shiny.pal"
INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors

4
data/pokemon/pic_pointers.asm
View file

@ -557,8 +557,8 @@ PokemonPicPointers::
dba HippunkBackpic
dba AercrowFrontpic
dba AercrowBackpic
dba FoxfireFrontpic
dba FoxfireBackpic
dba ZorriegoFrontpic
dba ZorriegoBackpic
dba YanmaFrontpic
dba YanmaBackpic
dba YanmegaFrontpic