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

constants/pokemon_constants.asm

@@ -292,7 +292,7 @@ DEF JOHTO_POKEMON EQU const_value
 	const SUNFLORA   ; c0
 	const HIPPUNK
 	const AERCROW
-	const FOXFIRE
+	const ZORRIEGO
 	const YANMA      ; c1
 	const YANMEGA
 	const ONIYANMA

data/pokemon/base_stats.asm

@@ -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"

data/pokemon/base_stats/zorriego.asm

@@ -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

data/pokemon/cries.asm

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

data/pokemon/dex_entries.asm

@@ -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

data/pokemon/dex_entry_pointers.asm

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

data/pokemon/dex_order_alpha.asm

@@ -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

data/pokemon/dex_order_new.asm

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

data/pokemon/egg_moves_johto.asm

@@ -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

data/pokemon/evolution_moves.asm

@@ -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

data/pokemon/evos_attacks_johto.asm

@@ -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

data/pokemon/first_stages.asm

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

data/pokemon/menu_icons.asm

@@ -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

data/pokemon/names.asm

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

data/pokemon/palettes.asm

@@ -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

data/pokemon/pic_pointers.asm

@@ -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

data/trainers/parties_new_classes.asm

@@ -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

data/wild/johto_water.asm

@@ -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

data/wild/nihon_grass.asm

@@ -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

gfx/footprints_johto.asm

@@ -61,7 +61,7 @@ INCBIN "gfx/footprints/sunbud.1bpp"
 INCBIN "gfx/footprints/sunflora.1bpp"
 INCBIN "gfx/footprints/hippunk.1bpp"
 INCBIN "gfx/footprints/aercrow.1bpp"
-INCBIN "gfx/footprints/foxfire.1bpp"
+INCBIN "gfx/footprints/zorriego.1bpp"
 INCBIN "gfx/footprints/yanma.1bpp"
 INCBIN "gfx/footprints/yanmega.1bpp"
 INCBIN "gfx/footprints/oniyanma.1bpp"

gfx/pics.asm

@@ -850,8 +850,8 @@ SunbudFrontpic:      INCBIN "gfx/pokemon/sunbud/front.animated.2bpp.lz"
 SunbudBackpic:       INCBIN "gfx/pokemon/sunbud/back.2bpp.lz"
 HippunkFrontpic:     INCBIN "gfx/pokemon/hippunk/front.animated.2bpp.lz"
 HippunkBackpic:      INCBIN "gfx/pokemon/hippunk/back.2bpp.lz"
-FoxfireFrontpic:     INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
-FoxfireBackpic:      INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
+ZorriegoFrontpic:    INCBIN "gfx/pokemon/zorriego/front.animated.2bpp.lz"
+ZorriegoBackpic:     INCBIN "gfx/pokemon/zorriego/back.2bpp.lz"
 YanmegaFrontpic:     INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
 YanmegaBackpic:      INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
 OniyanmaFrontpic:    INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -272,7 +272,7 @@ AnimationPointers:
 	dw SunfloraAnimation
 	dw HippunkAnimation
 	dw AercrowAnimation
-	dw FoxfireAnimation
+	dw ZorriegoAnimation
 	dw YanmaAnimation
 	dw YanmegaAnimation
 	dw OniyanmaAnimation

gfx/pokemon/anims.asm

@@ -270,7 +270,7 @@ SunbudAnimation:     INCLUDE "gfx/pokemon/sunbud/anim.asm"
 SunfloraAnimation:   INCLUDE "gfx/pokemon/sunflora/anim.asm"
 HippunkAnimation:    INCLUDE "gfx/pokemon/hippunk/anim.asm"
 AercrowAnimation:    INCLUDE "gfx/pokemon/aercrow/anim.asm"
-FoxfireAnimation:    INCLUDE "gfx/pokemon/magneton/anim.asm"
+ZorriegoAnimation:   INCLUDE "gfx/pokemon/zorriego/anim.asm"
 YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
 YanmegaAnimation:    INCLUDE "gfx/pokemon/yanmega/anim.asm"
 OniyanmaAnimation:   INCLUDE "gfx/pokemon/oniyanma/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -272,7 +272,7 @@ BitmasksPointers:
 	dw SunfloraBitmasks
 	dw HippunkBitmasks
 	dw AercrowBitmasks
-	dw FoxfireBitmasks
+	dw ZorriegoBitmasks
 	dw YanmaBitmasks
 	dw YanmegaBitmasks
 	dw OniyanmaBitmasks

gfx/pokemon/bitmasks.asm

@@ -270,7 +270,7 @@ SunbudBitmasks:     INCLUDE "gfx/pokemon/sunbud/bitmask.asm"
 SunfloraBitmasks:   INCLUDE "gfx/pokemon/sunflora/bitmask.asm"
 HippunkBitmasks:    INCLUDE "gfx/pokemon/hippunk/bitmask.asm"
 AercrowBitmasks:    INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
-FoxfireBitmasks:    INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
+ZorriegoBitmasks:    INCLUDE "gfx/pokemon/zorriego/bitmask.asm"
 YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
 YanmegaBitmasks:    INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
 OniyanmaBitmasks:   INCLUDE "gfx/pokemon/oniyanma/bitmask.asm"

gfx/pokemon/frame_pointers.asm

@@ -272,7 +272,7 @@ FramesPointers:
 	dba SunfloraFrames
 	dba HippunkFrames
 	dba AercrowFrames
-	dba FoxfireFrames
+	dba ZorriegoFrames
 	dba YanmaFrames
 	dba YanmegaFrames
 	dba OniyanmaFrames

gfx/pokemon/idle_pointers.asm

@@ -272,7 +272,7 @@ AnimationIdlePointers:
 	dw SunfloraAnimationIdle
 	dw HippunkAnimationIdle
 	dw AercrowAnimationIdle
-	dw FoxfireAnimationIdle
+	dw ZorriegoAnimationIdle
 	dw YanmaAnimationIdle
 	dw YanmegaAnimationIdle
 	dw OniyanmaAnimationIdle

gfx/pokemon/idles.asm

@@ -270,7 +270,7 @@ SunbudAnimationIdle:     INCLUDE "gfx/pokemon/sunbud/anim_idle.asm"
 SunfloraAnimationIdle:   INCLUDE "gfx/pokemon/sunflora/anim_idle.asm"
 HippunkAnimationIdle:    INCLUDE "gfx/pokemon/hippunk/anim_idle.asm"
 AercrowAnimationIdle:    INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
-FoxfireAnimationIdle:    INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
+ZorriegoAnimationIdle:   INCLUDE "gfx/pokemon/zorriego/anim_idle.asm"
 YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
 YanmegaAnimationIdle:    INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
 OniyanmaAnimationIdle:   INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -60,7 +60,7 @@ SunbudFrames:     INCLUDE "gfx/pokemon/sunbud/frames.asm"
 SunfloraFrames:   INCLUDE "gfx/pokemon/sunflora/frames.asm"
 HippunkFrames:    INCLUDE "gfx/pokemon/hippunk/frames.asm"
 AercrowFrames:    INCLUDE "gfx/pokemon/aercrow/frames.asm"
-FoxfireFrames:    INCLUDE "gfx/pokemon/foxfire/frames.asm"
+ZorriegoFrames:   INCLUDE "gfx/pokemon/zorriego/frames.asm"
 YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
 YanmegaFrames:    INCLUDE "gfx/pokemon/yanmega/frames.asm"
 OniyanmaFrames:   INCLUDE "gfx/pokemon/oniyanma/frames.asm"