thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-04-08 19:40:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ShiraTheMogul/jep-hack

Browse source
This commit is contained in:
Llinos Evans 2025-09-14 00:09:28 +01:00
commit 0628c76640
65 changed files with 1929 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/events/special_pointers.asm
View file

@ -69,6 +69,7 @@ SpecialsPointers::
add_special UpdateSprites ; bank 0
add_special UpdatePlayerSprite ; bank 0
add_special GameCornerPrizeMonCheckDex
add_special GameCornerPrizeMonShowDex
add_special UnusedSetSeenMon ; unused
add_special WaitSFX ; bank 0
add_special PlayMapMusic ; bank 0

64
data/maps/maps.asm
View file

@ -110,11 +110,11 @@ MapGroup_Dungeons:
map BurnedTowerB1F, TILESET_CAVE, CAVE, LANDMARK_BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
map NationalPark, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map NationalParkBugContest, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@ -624,53 +624,53 @@ MapGroup_Citrine: ; 27
MapGroup_OneIsland: ; 28
table_width MAP_LENGTH, MapGroup_OneIsland
map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_ONE_ISLAND_MAPS
MapGroup_TwoIsland: ; 29
table_width MAP_LENGTH, MapGroup_TwoIsland
map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_TWO_ISLAND_MAPS
MapGroup_ThreeIsland: ; 30
table_width MAP_LENGTH, MapGroup_ThreeIsland
map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BerryForest, TILESET_FOREST_KANTO, FOREST, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND
assert_table_length NUM_THREE_ISLAND_MAPS
MapGroup_FourIsland: ; 31
table_width MAP_LENGTH, MapGroup_FourIsland
map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_FOUR_ISLAND_MAPS
MapGroup_FiveIsland: ; 32
table_width MAP_LENGTH, MapGroup_FiveIsland
map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map FiveIsland, TILESET_SEVII, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_FIVE_ISLAND_MAPS
MapGroup_SixIsland: ; 33
table_width MAP_LENGTH, MapGroup_SixIsland
map SixIsland, TILESET_CAVE, TOWN, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SixIsland, TILESET_SEVII, TOWN, LANDMARK_SIX_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map WaterPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map RuinValley, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map DottedHole, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -682,7 +682,7 @@ MapGroup_SixIsland: ; 33
MapGroup_SevenIsland: ; 34
table_width MAP_LENGTH, MapGroup_SevenIsland
map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CanyonEntrance, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SevaultCanyon, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TanobyRuins, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

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

780
data/trainers/parties.asm
View file

File diff suppressed because it is too large Load diff

38
data/trainers/parties_new_classes.asm
View file

@ -199,6 +199,8 @@ KabufossilGroup:
LassGroup:
next_list_item ; LASS (1)
db "CARRIE@", TRAINERTYPE_NORMAL
db 16
dw CLEFFA
db 18
dw SNUBBULL
db -1 ; end
@ -206,11 +208,11 @@ LassGroup:
next_list_item ; LASS (2)
db "BRIDGET@", TRAINERTYPE_NORMAL
db 15
dw JIGGLYPUFF
dw AZURILL
db 15
dw JIGGLYPUFF
db 15
dw JIGGLYPUFF
dw HAPPINY
db 17
dw WIGGLYTUFF
db -1 ; end
next_list_item ; LASS (3)
@ -225,10 +227,10 @@ LassGroup:
next_list_item ; LASS (4)
db "KRISE@", TRAINERTYPE_NORMAL
db 12
dw ODDISH
db 15
dw CUBONE
dw SUNBUD
db 15
dw PHANPY
db -1 ; end
next_list_item ; LASS (5)
@ -279,12 +281,16 @@ LassGroup:
next_list_item ; LASS (10)
db "DANA@", TRAINERTYPE_MOVES
db 18
db 25
dw FLAAFFY
dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
db 18
dw PSYDUCK
db 24
dw WEIRDUCK
dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
db 25
dw RAITORA
dw QUICK_ATTACK, LEER, THUNDERSHOCK, ROAR
db -1 ; end
next_list_item ; LASS (11)
@ -297,8 +303,12 @@ LassGroup:
next_list_item ; LASS (12)
db "CONNIE@", TRAINERTYPE_NORMAL
db 21
dw MARILL
db 25
dw MAGNETITE
db 25
dw ANGORE
db 26
dw FORRETRESS
db -1 ; end
next_list_item ; LASS (13) - originally Connie 3
@ -789,8 +799,8 @@ TwinsGroup:
next_list_item ; TWINS (2)
db "ANN & ANNE@", TRAINERTYPE_MOVES
db 16
dw CLEFAIRY
dw GROWL, ENCORE, DOUBLESLAP, METRONOME
dw TOGEPI
dw CHARM, POISON_STING, METRONOME, SWEET_KISS
db 16
dw JIGGLYPUFF
dw SING, DEFENSE_CURL, POUND, DISABLE

6
data/wild/johto_water.asm
View file

@ -228,9 +228,9 @@ JohtoWaterWildMons:
def_water_wildmons CIANWOOD_CITY
db 6 percent ; encounter rate
dbw 30, TENTACOOL
dbw 35, CHINCHOU
dbw 30, TENTACRUEL
dbw 25, TENTACOOL
dbw 20, CHINCHOU
dbw 25, TENTACRUEL
end_water_wildmons
def_water_wildmons OLIVINE_CITY

4
data/wild/nihon_grass.asm
View file

@ -220,7 +220,7 @@ NihonGrassWildMons:
dbw 35, WARUCHU
; nite
dbw 30, MURKROW
dbw 31, FOXFIRE
dbw 31, ZORRIEGO
dbw 30, MURKROW
dbw 31, SNEASEL
dbw 32, ARBOK
@ -250,7 +250,7 @@ NihonGrassWildMons:
dbw 35, WARUCHU
; nite
dbw 30, MURKROW
dbw 31, FOXFIRE
dbw 31, ZORRIEGO
dbw 30, MURKROW
dbw 31, SNEASEL
dbw 32, ARBOK