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

The Swines, A Dragonfly and the changed Giraffe

Browse source 
- Adds Mamoswine, alongside the new Hirsuswine, a slower and more tanky alternate evolution. Design by me, sprite by zuperZACH.

- Adds the framework for an alternate Yanma evolution, currently dubbed Pending03. It's designed to be based on a clubtail, albeit one that uses its tail like an actual weapon.

- Adds the framework for Emordrome, an alternate Normal/Ghost Girafarig evolution where the dark head grows and takes control. In order to not make the line any more complicated, Calflac has been removed entirely.

- Added cries for the Cubburn line.
This commit is contained in:
Martha Schilling 2024-07-31 20:35:18 +01:00
parent 1d41bfa2f8
commit ff9243c7fb
67 changed files with 363 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/pokemon/base_stats.asm
View file

@ -302,6 +302,7 @@ INCLUDE "data/pokemon/base_stats/aercrow.asm"
INCLUDE "data/pokemon/base_stats/foxfire.asm"
INCLUDE "data/pokemon/base_stats/yanma.asm"
INCLUDE "data/pokemon/base_stats/yanmega.asm"
INCLUDE "data/pokemon/base_stats/pending03.asm"
INCLUDE "data/pokemon/base_stats/wooper.asm"
INCLUDE "data/pokemon/base_stats/quagsire.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"
@ -320,9 +321,9 @@ INCLUDE "data/pokemon/base_stats/unown.asm"
INCLUDE "data/pokemon/base_stats/wynaut.asm"
INCLUDE "data/pokemon/base_stats/wobbuffet.asm"
INCLUDE "data/pokemon/base_stats/bipulla.asm"
INCLUDE "data/pokemon/base_stats/calflac.asm"
INCLUDE "data/pokemon/base_stats/girafarig.asm"
INCLUDE "data/pokemon/base_stats/farigiraf.asm"
INCLUDE "data/pokemon/base_stats/emordrome.asm"
INCLUDE "data/pokemon/base_stats/pineco.asm"
INCLUDE "data/pokemon/base_stats/forretress.asm"
INCLUDE "data/pokemon/base_stats/dunsparce.asm"
@ -347,6 +348,8 @@ INCLUDE "data/pokemon/base_stats/slugma.asm"
INCLUDE "data/pokemon/base_stats/magcargo.asm"
INCLUDE "data/pokemon/base_stats/swinub.asm"
INCLUDE "data/pokemon/base_stats/piloswine.asm"
INCLUDE "data/pokemon/base_stats/mamoswine.asm"
INCLUDE "data/pokemon/base_stats/hirsuswine.asm"
INCLUDE "data/pokemon/base_stats/corsola.asm"
INCLUDE "data/pokemon/base_stats/remoraid.asm"
INCLUDE "data/pokemon/base_stats/octillery.asm"

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 75, 60, 70, 90, 105, 120
; hp atk def spd sat sdf
db NORMAL, GHOST ; type
db 45 ; catch rate
db 197 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/emordrome/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_INDETERMINATE ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT
; end

2
data/pokemon/base_stats/farigiraf.asm
View file

@ -5,7 +5,7 @@
db NORMAL, PSYCHIC_TYPE ; type
db 45 ; catch rate
db 255 ; base exp
db 197 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 100, 110, 120, 20, 60, 120
; hp atk def spd sat sdf
db ICE, GROUND ; type
db 50 ; catch rate
db 207 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/hirsuswine/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
; end

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 110, 130, 80, 80, 70, 60
; hp atk def spd sat sdf
db ICE, GROUND ; type
db 50 ; catch rate
db 207 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/mamoswine/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
; end

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

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 95, 115, 75, 85, 80, 65
; hp atk def spd sat sdf
db BUG, FLYING ; type
db 30 ; catch rate
db 198 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/pending03/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_BUG, EGG_BUG ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH
; end

4
data/pokemon/base_stats/yanmega.asm
View file

@ -1,4 +1,4 @@
db YANMEGA ; species ID placeholder
db 0 ; species ID placeholder
db 86, 76, 86, 95, 116, 56
; hp atk def spd sat sdf
@ -17,5 +17,5 @@
dn EGG_BUG, EGG_BUG ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH
; end

13
data/pokemon/cries.asm
View file

@ -227,9 +227,9 @@ PokemonCries::
mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE
mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW
mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR
mon_cry CRY_NIDORAN_M, 0, 0 ; CUBBURN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; FLAMBEAR (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; BRUINOUS (incomplete)
mon_cry CRY_MARILL, 160, 128 ; CUBBURN
mon_cry CRY_TOTODILE, 752, 160 ; FLAMBEAR
mon_cry CRY_TOTODILE, 3558, 496 ; BRUINOUS
mon_cry CRY_NIDORAN_M, 0, 0 ; PALSSIO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PRESSIO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; DONMARIN (incomplete)
@ -281,6 +281,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; FOXFIRE (incomplete)
mon_cry CRY_TOTODILE, 49, 200 ; YANMA
mon_cry CRY_NIDORAN_M, 0, 0 ; YANMEGA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PENDING03 (incomplete)
mon_cry CRY_WOOPER, 147, 175 ; WOOPER
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON
@ -298,10 +299,10 @@ PokemonCries::
mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN
mon_cry CRY_NIDORAN_M, 0, 0 ; WYNAUT (incomplete)
mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET
mon_cry CRY_NIDORAN_M, 0, 0 ; BIPULLA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CALFLAC (incomplete)
mon_cry CRY_GIRAFARIG, 48, 256 ; BIPULLA
mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG
mon_cry CRY_NIDORAN_M, 0, 0 ; FARIGIRAF (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; EMORDROME (incomplete)
mon_cry CRY_SLOWKING, 128, 256 ; PINECO
mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS
mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE
@ -326,6 +327,8 @@ PokemonCries::
mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO
mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB
mon_cry CRY_MAGCARGO, -265, 256 ; PILOSWINE
mon_cry CRY_NIDORAN_M, 0, 0 ; MAMOSWINE (incomplete)
mon_cry CRY_MAGCARGO, -781, 512 ; HIRSUSWINE
mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA
mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID
mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY

11
data/pokemon/dex_entries.asm
View file

@ -274,14 +274,15 @@ FoxfirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/foxfire.asm"
SECTION "Pokedex Entries 193-251", ROMX
YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm"
YanmegaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magneton.asm"
YanmegaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanmega.asm"
Pending03PokedexEntry:: INCLUDE "data/pokemon/dex_entries/pending03.asm"
WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm"
QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm"
EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm"
UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm"
LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm"
LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm"
GlaceonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/glaceon.asm"
SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm"
SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm"
MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm"
HonchkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/honchkrow.asm"
SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm"
@ -293,9 +294,9 @@ UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm"
WynautPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wynaut.asm"
WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm"
BipullaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bipulla.asm"
CalflacPokedexEntry:: INCLUDE "data/pokemon/dex_entries/calflac.asm"
GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/girafarig.asm"
FarigirafPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farigiraf.asm"
EmordromePokedexEntry:: INCLUDE "data/pokemon/dex_entries/emordrome.asm"
PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pineco.asm"
ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/forretress.asm"
DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dunsparce.asm"
@ -320,6 +321,8 @@ SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slugma.asm"
MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magcargo.asm"
SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/swinub.asm"
PiloswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/piloswine.asm"
MamoswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mamoswine.asm"
HirsuswinePokedexEntry:: INCLUDE "data/pokemon/dex_entries/hirsuswine.asm"
CorsolaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/corsola.asm"
RemoraidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/remoraid.asm"
OctilleryPokedexEntry:: INCLUDE "data/pokemon/dex_entries/octillery.asm"

10
data/pokemon/dex_entries/calflac.asm
View file

@ -1,10 +0,0 @@
db "CALF@" ; species name
dw 311, 350 ; height, weight
db "Both of BIPULLA's"
next "halves joined to"
next "become CALFLAC."
page "However, its two"
next "brains struggle"
next "to cooperate.@"

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

@ -0,0 +1,10 @@
db "CONJOINED@" ; species name
dw 703, 1870 ; height, weight
db "GIRAFARIG's small"
next "head gained enough"
next "power to take over"
page "control, much to"
next "the dismay of the"
next "original head.@"

2
data/pokemon/dex_entries/farigiraf.asm
View file

@ -1,5 +1,5 @@
db "LONG NECK@" ; species name
dw 1006, 3527 ; height, weight
dw 1006, 3520 ; height, weight
db "The tail having"
next "consumed the head,"

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

@ -0,0 +1,10 @@
db "WAR PIG@" ; species name
dw 611, 3290 ; height, weight
db "Its battle-scarred"
next "tusks are a symbol"
next "of its bravery."
page "Only the hardiest"
next "of PILOSWINE can"
next "evolve into it.@"

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

@ -0,0 +1,10 @@
db "TWIN TUSK@" ; species name
dw 802, 6410 ; height, weight
db "Once thought to be"
next "extinct following"
next "the ice age, one"
page "was found frozen"
next "in ice dating back"
next "10,000 years.@"

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

@ -0,0 +1,10 @@
db "CLUBTAIL@" ; species name
dw 503, 1560 ; height, weight
db "It stuns its prey"
next "by striking them"
next "with its heavy"
page "tail, then tears"
next "them apart with"
next "its mandibles.@"

10
data/pokemon/dex_entries/yanmega.asm
View file

@ -1,10 +1,10 @@
db "OGRE DARNER@" ; species name
dw 603, 1135 ; height, weight
dw 603, 1130 ; height, weight
db "Filled with"
next "primeval power,"
next "the sound of its"
db "Filled with prim-"
next "eval power, the"
next "sound of its wings"
page "wings is often"
page "beating is often"
next "mistaken for that"
next "of a helicopter.@"

5
data/pokemon/dex_entry_pointers.asm
View file

@ -276,6 +276,7 @@ PokedexDataPointerTable:
dba FoxfirePokedexEntry
dba YanmaPokedexEntry
dba YanmegaPokedexEntry
dba Pending03PokedexEntry
dba WooperPokedexEntry
dba QuagsirePokedexEntry
dba EspeonPokedexEntry
@ -294,9 +295,9 @@ PokedexDataPointerTable:
dba WynautPokedexEntry
dba WobbuffetPokedexEntry
dba BipullaPokedexEntry
dba CalflacPokedexEntry
dba GirafarigPokedexEntry
dba FarigirafPokedexEntry
dba EmordromePokedexEntry
dba PinecoPokedexEntry
dba ForretressPokedexEntry
dba DunsparcePokedexEntry
@ -321,6 +322,8 @@ PokedexDataPointerTable:
dba MagcargoPokedexEntry
dba SwinubPokedexEntry
dba PiloswinePokedexEntry
dba MamoswinePokedexEntry
dba HirsuswinePokedexEntry
dba CorsolaPokedexEntry
dba RemoraidPokedexEntry
dba OctilleryPokedexEntry

5
data/pokemon/dex_order_alpha.asm
View file

@ -39,7 +39,6 @@ AlphabeticalPokedexOrder:
dw BUTTERFREE
dw BUU
dw CACAWPHONY
dw CALFLAC
dw CARAPTHOR
dw CARETORKER
dw CATERPIE
@ -91,6 +90,7 @@ AlphabeticalPokedexOrder:
dw ELECTIVIRE
dw ELECTRODE
dw ELEKID
dw EMORDROME
dw ENTEI
dw ESPEON
dw EUCALA
@ -140,6 +140,7 @@ AlphabeticalPokedexOrder:
dw HAUNTER
dw HERACROSS
dw HIPPUNK
dw HIRSUSWINE
dw HITMONCHAN
dw HITMONLEE
dw HITMONTOP
@ -206,6 +207,7 @@ AlphabeticalPokedexOrder:
dw MAGNETON
dw MAGNETITE
dw MAGNEZONE
dw MAMOSWINE
dw MANKEY
dw MANTINE
dw MANTYKE
@ -393,6 +395,7 @@ AlphabeticalPokedexOrder:
dw XYLODON
dw XYLOFIN
dw YANMA
dw PENDING03 ; this thing's gonna start with Yan, surely, so I'm putting it here.
dw YANMEGA
dw ZAPDOS
dw ZUBAT

5
data/pokemon/dex_order_new.asm
View file

@ -132,6 +132,7 @@ NewPokedexOrder:
dw NIDOREIGN
dw YANMA
dw YANMEGA
dw PENDING03
dw SUNKERN
dw SUNBUD
dw SUNFLORA
@ -199,9 +200,9 @@ NewPokedexOrder:
dw HITMONCHAN
dw HITMONTOP
dw BIPULLA
dw CALFLAC
dw GIRAFARIG
dw FARIGIRAF
dw EMORDROME
dw TAUROS
dw MILTANK
dw MAGBY
@ -281,6 +282,8 @@ NewPokedexOrder:
dw DELIBIRD
dw SWINUB
dw PILOSWINE
dw MAMOSWINE
dw HIRSUSWINE
dw TEDDIURSA
dw URSARING
dw URSALUNA

5
data/pokemon/egg_moves_johto.asm
View file

@ -64,6 +64,7 @@ EggMovePointers2::
dw FoxfireEggMoves
dw YanmaEggMoves
dw NoEggMoves2 ; Yanmega
dw NoEggMoves2 ; Pending03
dw WooperEggMoves
dw NoEggMoves2
dw NoEggMoves2
@ -82,9 +83,9 @@ EggMovePointers2::
dw NoEggMoves2 ; Wynaut
dw NoEggMoves2
dw BipullaEggMoves
dw NoEggMoves2 ; Calflac
dw NoEggMoves2 ; Girafarig
dw NoEggMoves2 ; Farigiraf
dw NoEggMoves2 ; Emordrome
dw PinecoEggMoves
dw NoEggMoves2
dw DunsparceEggMoves
@ -109,6 +110,8 @@ EggMovePointers2::
dw NoEggMoves2
dw SwinubEggMoves
dw NoEggMoves2
dw NoEggMoves2 ; Mamoswine
dw NoEggMoves2 ; Hirsuswine
dw CorsolaEggMoves
dw RemoraidEggMoves
dw NoEggMoves2

99
data/pokemon/evos_attacks_johto.asm
View file

@ -64,6 +64,7 @@ EvosAttacksPointers2::
dw FoxfireEvosAttacks
dw YanmaEvosAttacks
dw YanmegaEvosAttacks
dw Pending03EvosAttacks
dw WooperEvosAttacks
dw QuagsireEvosAttacks
dw EspeonEvosAttacks
@ -82,9 +83,9 @@ EvosAttacksPointers2::
dw WynautEvosAttacks
dw WobbuffetEvosAttacks
dw BipullaEvosAttacks
dw CalflacEvosAttacks
dw GirafarigEvosAttacks
dw FarigirafEvosAttacks
dw EmordromeEvosAttacks
dw PinecoEvosAttacks
dw ForretressEvosAttacks
dw DunsparceEvosAttacks
@ -109,6 +110,8 @@ EvosAttacksPointers2::
dw MagcargoEvosAttacks
dw SwinubEvosAttacks
dw PiloswineEvosAttacks
dw MamoswineEvosAttacks
dw HirsuswineEvosAttacks
dw CorsolaEvosAttacks
dw RemoraidEvosAttacks
dw OctilleryEvosAttacks
@ -990,7 +993,8 @@ FoxfireEvosAttacks:
db 0 ; no more level-up moves
YanmaEvosAttacks:
dbbw EVOLVE_LEVEL, 34, YANMEGA ; to be changed
dbbw EVOLVE_LEVEL, 33, YANMEGA ; to be changed
dbbw EVOLVE_LEVEL, 10, PENDING03 ; to be changed
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
@ -1019,6 +1023,25 @@ YanmegaEvosAttacks:
dbw 37, WING_ATTACK
dbw 43, SCREECH
db 0 ; no more level-up moves
Pending03EvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
dbw 1, CONFUSION
dbw 1, FLAIL
dbw 7, QUICK_ATTACK
dbw 13, DOUBLE_TEAM
dbw 19, SONICBOOM
dbw 25, DETECT
dbw 29, SUPERSONIC
dbw 33, POISONPOWDER
dbw 33, SLEEP_POWDER
dbw 33, STUN_SPORE
dbw 37, SLASH
dbw 37, WING_ATTACK
dbw 43, SCREECH
db 0 ; no more level-up moves
WooperEvosAttacks:
dbbw EVOLVE_LEVEL, 20, QUAGSIRE
@ -1127,7 +1150,6 @@ MurkrowEvosAttacks:
db 0 ; no more level-up moves
HonchkrowEvosAttacks:
dbbw EVOLVE_ITEM, DUSK_STONE, HONCHKROW
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, PURSUIT
@ -1225,7 +1247,7 @@ WobbuffetEvosAttacks:
db 0 ; no more level-up moves
BipullaEvosAttacks:
dbbw EVOLVE_LEVEL, 17, CALFLAC
dbbw EVOLVE_LEVEL, 24, GIRAFARIG
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
@ -1238,23 +1260,9 @@ BipullaEvosAttacks:
dbw 45, PSYCHIC_M
db 0 ; no more level-up moves
CalflacEvosAttacks:
dbbw EVOLVE_LEVEL, 29, GIRAFARIG
db 0 ; no more Evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 7, CONFUSION
dbw 13, LICK
dbw 17, STOMP
dbw 22, AGILITY
dbw 31, BATON_PASS
dbw 41, PSYBEAM
dbw 50, CRUNCH
dbw 55, PSYCHIC_M
db 0 ; no more level-up moves
GirafarigEvosAttacks:
dbbw EVOLVE_LEVEL, 44, FARIGIRAF
dbbw EVOLVE_ITEM, DUSK_STONE, EMORDROME ; to be changed maybe?
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
@ -1281,6 +1289,21 @@ FarigirafEvosAttacks:
dbw 56, CRUNCH
dbw 65, PSYCHIC_M
db 0 ; no more level-up moves
EmordromeEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 1, SPITE
dbw 7, CONFUSION
dbw 13, LICK
dbw 17, STOMP
dbw 22, AGILITY
dbw 32, BATON_PASS
dbw 44, SHADOW_BALL
dbw 56, CRUNCH
dbw 65, DESTINY_BOND
db 0 ; no more level-up moves
PinecoEvosAttacks:
dbbw EVOLVE_LEVEL, 31, FORRETRESS
@ -1594,18 +1617,50 @@ SwinubEvosAttacks:
db 0 ; no more level-up moves
PiloswineEvosAttacks:
dbbw EVOLVE_LEVEL, 43, MAMOSWINE ; to be changed
dbbw EVOLVE_LEVEL, 42, HIRSUSWINE
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, HORN_ATTACK
dbw 1, POWDER_SNOW
dbw 1, ENDURE
dbw 10, POWDER_SNOW
dbw 19, ENDURE
dbw 28, TAKE_DOWN
dbw 33, FURY_ATTACK
dbw 42, MIST
dbw 42, ANCIENTPOWER
dbw 47, MIST
dbw 56, BLIZZARD
dbw 70, AMNESIA
db 0 ; no more level-up moves
MamoswineEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, HORN_ATTACK
dbw 10, POWDER_SNOW
dbw 19, ENDURE
dbw 28, TAKE_DOWN
dbw 33, FURY_ATTACK
dbw 42, ANCIENTPOWER
dbw 49, MIST
dbw 53, EARTHQUAKE
dbw 58, BLIZZARD
dbw 65, SCARY_FACE
dbw 73, AMNESIA
db 0 ; no more level-up moves
HirsuswineEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, HORN_ATTACK
dbw 10, POWDER_SNOW
dbw 19, ENDURE
dbw 28, TAKE_DOWN
dbw 33, FURY_ATTACK
dbw 42, HORN_DRILL
dbw 49, MIST
dbw 58, BLIZZARD
dbw 73, AMNESIA
db 0 ; no more level-up moves
CorsolaEvosAttacks:
db 0 ; no more evolutions

3
data/pokemon/first_stages.asm
View file

@ -276,6 +276,7 @@ FirstEvoStages::
dw FOXFIRE
dw YANMA
dw YANMA
dw YANMA
dw WOOPER
dw WOOPER
dw EEVEE
@ -321,6 +322,8 @@ FirstEvoStages::
dw SLUGMA
dw SWINUB
dw SWINUB
dw SWINUB
dw SWINUB
dw CORSOLA
dw REMORAID
dw REMORAID ;e0

5
data/pokemon/gen1_order.asm
View file

@ -247,6 +247,7 @@ Pokered_MonIndices:
db SUNFLORA
db AERCROW
db YANMA
db PENDING03
db WOOPER
db QUAGSIRE
db ESPEON
@ -261,9 +262,9 @@ Pokered_MonIndices:
db WYNAUT
db WOBBUFFET
db BIPULLA
db CALFLAC
db GIRAFARIG
db FARIGIRAF
db EMORDROME
db PINECO
db FORRETRESS
db DUNSPARCE
@ -393,4 +394,6 @@ Pokered_MonIndices:
db FERADACTYL
db DECILLA
db GAWARHED
db MAMOSWINE
db HIRSUSWINE
assert_table_length NUM_POKEMON - 1

5
data/pokemon/menu_icons.asm
View file

@ -277,6 +277,7 @@ MonMenuIcons:
db ICON_FOX ; FOXFIRE
db ICON_BUG ; YANMA
db ICON_BUG ; YANMEGA
db ICON_BUG ; PENDING03
db ICON_MONSTER ; WOOPER
db ICON_MONSTER ; QUAGSIRE
db ICON_FOX ; ESPEON
@ -295,9 +296,9 @@ MonMenuIcons:
db ICON_GHOST ; WYNAUT
db ICON_GHOST ; WOBBUFFET
db ICON_GHOST ; BIPULLA
db ICON_EQUINE ; CALFLAC
db ICON_EQUINE ; GIRAFARIG
db ICON_EQUINE ; FARIGIRAF
db ICON_EQUINE ; EMORDROME
db ICON_BUG ; PINECO
db ICON_BUG ; FORRETRESS
db ICON_SERPENT ; DUNSPARCE
@ -322,6 +323,8 @@ MonMenuIcons:
db ICON_BLOB ; MAGCARGO
db ICON_EQUINE ; SWINUB
db ICON_EQUINE ; PILOSWINE
db ICON_EQUINE ; MAMOSWINE
db ICON_EQUINE ; HIRSUSWINE
db ICON_SHELL ; CORSOLA
db ICON_FISH ; REMORAID
db ICON_FISH ; OCTILLERY

5
data/pokemon/names.asm
View file

@ -279,6 +279,7 @@ PokemonNames::
db "FOXFIRE@@@"
db "YANMA@@@@@"
db "YANMEGA@@@"
db "PENDING03@"
db "WOOPER@@@@"
db "QUAGSIRE@@"
db "ESPEON@@@@"
@ -297,9 +298,9 @@ PokemonNames::
db "WYNAUT@@@@"
db "WOBBUFFET@"
db "BIPULLA@@@"
db "CALFLAC@@@"
db "GIRAFARIG@"
db "FARIGIRAF@"
db "EMORDROME@"
db "PINECO@@@@"
db "FORRETRESS"
db "DUNSPARCE@"
@ -324,6 +325,8 @@ PokemonNames::
db "MAGCARGO@@"
db "SWINUB@@@@"
db "PILOSWINE@"
db "MAMOSWINE@"
db "HIRSUSWINE"
db "CORSOLA@@@"
db "REMORAID@@"
db "OCTILLERY@"

10
data/pokemon/palettes.asm
View file

@ -583,6 +583,8 @@ INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/yanma/shiny.pal"
INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/yanmega/shiny.pal"
INCBIN "gfx/pokemon/pending03/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pending03/shiny.pal"
INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wooper/shiny.pal"
INCBIN "gfx/pokemon/quagsire/front.gbcpal", middle_colors
@ -619,12 +621,12 @@ INCBIN "gfx/pokemon/wobbuffet/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"
INCBIN "gfx/pokemon/bipulla/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/bipulla/shiny.pal"
INCBIN "gfx/pokemon/calflac/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/calflac/shiny.pal"
INCBIN "gfx/pokemon/girafarig/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/girafarig/shiny.pal"
INCBIN "gfx/pokemon/farigiraf/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/farigiraf/shiny.pal"
INCBIN "gfx/pokemon/emordrome/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/emordrome/shiny.pal"
INCBIN "gfx/pokemon/pineco/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pineco/shiny.pal"
INCBIN "gfx/pokemon/forretress/front.gbcpal", middle_colors
@ -673,6 +675,10 @@ INCBIN "gfx/pokemon/swinub/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/swinub/shiny.pal"
INCBIN "gfx/pokemon/piloswine/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/piloswine/shiny.pal"
INCBIN "gfx/pokemon/mamoswine/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/mamoswine/shiny.pal"
INCBIN "gfx/pokemon/hirsuswine/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/hirsuswine/shiny.pal"
INCBIN "gfx/pokemon/corsola/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/corsola/shiny.pal"
INCBIN "gfx/pokemon/remoraid/front.gbcpal", middle_colors

10
data/pokemon/pic_pointers.asm
View file

@ -563,6 +563,8 @@ PokemonPicPointers::
dba YanmaBackpic
dba YanmegaFrontpic
dba YanmegaBackpic
dba Pending03Frontpic
dba Pending03Backpic
dba WooperFrontpic
dba WooperBackpic
dba QuagsireFrontpic
@ -602,12 +604,12 @@ PokemonPicPointers::
dba WobbuffetBackpic
dba BipullaFrontpic
dba BipullaBackpic
dba CalflacFrontpic
dba CalflacBackpic
dba GirafarigFrontpic
dba GirafarigBackpic
dba FarigirafFrontpic
dba FarigirafBackpic
dba EmordromeFrontpic
dba EmordromeBackpic
dba PinecoFrontpic
dba PinecoBackpic
dba ForretressFrontpic
@ -656,6 +658,10 @@ PokemonPicPointers::
dba SwinubBackpic
dba PiloswineFrontpic
dba PiloswineBackpic
dba MamoswineFrontpic
dba MamoswineBackpic
dba HirsuswineFrontpic
dba HirsuswineBackpic
dba CorsolaFrontpic
dba CorsolaBackpic
dba RemoraidFrontpic

12
data/wild/johto_grass.asm
View file

@ -384,19 +384,19 @@ JohtoGrassWildMons:
; morn
dbw 24, SMEARGLE
dbw 26, QATU
dbw 24, CALFLAC
dbw 24, QATU
dbw 27, QATU
dbw 25, SMEARGLE
dbw 25, CALFLAC
dbw 26, CALFLAC
dbw 25, GIRAFARIG
dbw 26, GIRAFARIG
; day
dbw 24, SMEARGLE
dbw 26, QATU
dbw 24, CALFLAC
dbw 24, QATU
dbw 27, QATU
dbw 25, SMEARGLE
dbw 25, CALFLAC
dbw 26, CALFLAC
dbw 25, GIRAFARIG
dbw 26, GIRAFARIG
; nite
dbw 24, QUAGSIRE
dbw 26, QATU