thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Distributing New Moves and the Rise of the Clubtail

Browse source
This commit is contained in:
Misty 2024-08-31 18:23:39 -04:00
parent d240c4b046
commit 06ba5dad31
36 changed files with 268 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/pokemon_constants.asm
View file

@ -295,7 +295,7 @@ DEF JOHTO_POKEMON EQU const_value
const FOXFIRE
const YANMA ; c1
const YANMEGA
const PENDING03
const ONIYANMA
const WOOPER ; c2
const QUAGSIRE ; c3
const ESPEON ; c4

2
data/pokemon/base_stats.asm
View file

@ -302,7 +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/oniyanma.asm"
INCLUDE "data/pokemon/base_stats/wooper.asm"
INCLUDE "data/pokemon/base_stats/quagsire.asm"
INCLUDE "data/pokemon/base_stats/espeon.asm"

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

@ -14,7 +14,7 @@
INCBIN "gfx/pokemon/cyclorp/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER
dn EGG_NONE, EGG_NONE ; egg groups
dn EGG_BUG, EGG_WATER_3 ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT

2
data/pokemon/base_stats/pending03.asm → data/pokemon/base_stats/oniyanma.asm
View file

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

2
data/pokemon/cries.asm
View file

@ -281,7 +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_NIDORAN_M, 0, 0 ; ONIYANMA (incomplete)
mon_cry CRY_WOOPER, 147, 175 ; WOOPER
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON

2
data/pokemon/dex_entries.asm
View file

@ -275,7 +275,7 @@ SECTION "Pokedex Entries 193-251", ROMX
YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm"
YanmegaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanmega.asm"
Pending03PokedexEntry:: INCLUDE "data/pokemon/dex_entries/pending03.asm"
OniyanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oniyanma.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"

0
data/pokemon/dex_entries/pending03.asm → data/pokemon/dex_entries/oniyanma.asm
View file

2
data/pokemon/dex_entry_pointers.asm
View file

@ -276,7 +276,7 @@ PokedexDataPointerTable:
dba FoxfirePokedexEntry
dba YanmaPokedexEntry
dba YanmegaPokedexEntry
dba Pending03PokedexEntry
dba OniyanmaPokedexEntry
dba WooperPokedexEntry
dba QuagsirePokedexEntry
dba EspeonPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -250,6 +250,7 @@ AlphabeticalPokedexOrder:
dw OMANYTE
dw OMASTAR
dw ONIX
dw ONIYANMA
dw ORFRY
dw PALSSIO
dw PARAS
@ -396,7 +397,6 @@ 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

2
data/pokemon/dex_order_new.asm
View file

@ -132,7 +132,7 @@ NewPokedexOrder:
dw NIDOREIGN
dw YANMA
dw YANMEGA
dw PENDING03
dw ONIYANMA
dw SUNKERN
dw SUNBUD
dw SUNFLORA

13
data/pokemon/egg_moves_johto.asm
View file

@ -64,7 +64,7 @@ EggMovePointers2::
dw FoxfireEggMoves
dw YanmaEggMoves
dw NoEggMoves2 ; Yanmega
dw NoEggMoves2 ; Pending03
dw NoEggMoves2 ; Oniyanma
dw WooperEggMoves
dw NoEggMoves2
dw NoEggMoves2
@ -214,6 +214,7 @@ TotodileEggMoves:
dw ANCIENTPOWER
dw RAZOR_WIND
dw ROCK_SLIDE
dw WATER_SPORT
dw -1 ; end
CubburnEggMoves:
@ -253,6 +254,8 @@ LedybaEggMoves:
dw PSYBEAM
dw BIDE
dw LIGHT_SCREEN
dw STRONG_ARM
dw UPPERCUT
dw -1 ; end
SpinarakEggMoves:
@ -298,6 +301,7 @@ IgglybuffEggMoves:
dw PERISH_SONG
dw PRESENT
dw FAINT_ATTACK
dw BOUNCE
dw -1 ; end
TogepiEggMoves:
@ -340,6 +344,7 @@ AzurillEggMoves:
dw PERISH_SONG
dw SUPERSONIC
dw FORESIGHT
dw WATER_SPORT
dw -1 ; end
BonslyEggMoves:
@ -403,6 +408,7 @@ WooperEggMoves:
dw BODY_SLAM
dw ANCIENTPOWER
dw SAFEGUARD
dw UPROOT
dw -1 ; end
MurkrowEggMoves:
@ -523,6 +529,7 @@ SwinubEggMoves:
dw BODY_SLAM
dw ROCK_SLIDE
dw ANCIENTPOWER
dw UPROOT
dw -1 ; end
CorsolaEggMoves:
@ -568,6 +575,7 @@ SkarmoryEggMoves:
dw PURSUIT
dw WHIRLWIND
dw SKY_ATTACK
dw WIND_RIDE
dw -1 ; end
HoundourEggMoves:
@ -585,6 +593,7 @@ PhanpyEggMoves:
dw BODY_SLAM
dw ANCIENTPOWER
dw WATER_GUN
dw ROCK_HEAD
dw -1 ; end
StantlerEggMoves:
@ -609,6 +618,8 @@ TyrogueEggMoves:
dw HI_JUMP_KICK
dw MACH_PUNCH
dw MIND_READER
dw STRONG_ARM
dw UPPERCUT
dw -1 ; end
SmoochumEggMoves:

16
data/pokemon/egg_moves_kanto.asm
View file

@ -180,7 +180,7 @@ EggMovePointers1:
dw PinsirEggMoves
dw NoEggMoves1 ; Tricules
dw NoEggMoves1
dw NoEggMoves1
dw MagikarpEggMoves
dw NoEggMoves1
dw NoEggMoves1 ; Magiprey
dw NoEggMoves1 ; Terrados
@ -221,6 +221,7 @@ BulbasaurEggMoves:
dw SAFEGUARD
dw RAZOR_WIND
dw PETAL_DANCE
dw UPROOT
dw -1 ; end
CharmanderEggMoves:
@ -268,6 +269,7 @@ SpearowEggMoves:
dw SCARY_FACE
dw QUICK_ATTACK
dw TRI_ATTACK
dw WIND_RIDE
dw -1 ; end
EkansEggMoves:
@ -304,6 +306,7 @@ NidoranMEggMoves:
dw AMNESIA
dw COUNTER
dw BEAT_UP
dw ROCK_HEAD
dw -1 ; end
VulpiiiEggMoves:
@ -395,6 +398,7 @@ PoliwagEggMoves:
dw BUBBLEBEAM
dw HAZE
dw MIND_READER
dw WATER_SPORT
dw -1 ; end
AbraEggMoves:
@ -506,6 +510,7 @@ DoduoEggMoves:
dw HAZE
dw FAINT_ATTACK
dw FLAIL
dw MEGAPHONE
dw -1 ; end
SeelEggMoves:
@ -554,6 +559,7 @@ KrabbyEggMoves:
dw FLAIL
dw SLAM
dw ROCK_SLASH
dw CROSS_CUTTER
dw -1 ; end
ExeggcuteEggMoves:
@ -619,6 +625,7 @@ KangaskhanEggMoves:
dw FOCUS_ENERGY
dw SAFEGUARD
dw DISABLE
dw MEGAPHONE
dw -1 ; end
HorseaEggMoves:
@ -674,6 +681,10 @@ PinsirEggMoves:
dw ROCK_SLASH
dw -1 ; end
MagikarpEggMoves:
dw BOUNCE
dw -1 ; end
LaprasEggMoves:
dw AURORA_BEAM
dw FORESIGHT
@ -682,6 +693,7 @@ LaprasEggMoves:
EeveeEggMoves:
dw FLAIL
dw CHARM
dw BRIGHT_MOSS
dw -1 ; end
OmanyteEggMoves:
@ -690,6 +702,7 @@ OmanyteEggMoves:
dw SLAM
dw SUPERSONIC
dw HAZE
dw BRIGHT_MOSS
dw -1 ; end
KabutoEggMoves:
@ -698,6 +711,7 @@ KabutoEggMoves:
dw RAPID_SPIN
dw DIG
dw FLAIL
dw CROSS_CUTTER
dw -1 ; end
FeradactylEggMoves:

2
data/pokemon/evolution_moves.asm
View file

@ -274,7 +274,7 @@ EvolutionMoves::
dw NO_MOVE ;FOXFIRE
dw NO_MOVE ;YANMA ; c1
dw NO_MOVE ;YANMEGA
dw NO_MOVE ;PENDING03
dw NO_MOVE ;ONIYANMA
dw NO_MOVE ;WOOPER ; c2
dw NO_MOVE ;QUAGSIRE ; c3
dw NO_MOVE ;ESPEON ; c4

171
data/pokemon/evos_attacks_johto.asm
View file

@ -64,7 +64,7 @@ EvosAttacksPointers2::
dw FoxfireEvosAttacks
dw YanmaEvosAttacks
dw YanmegaEvosAttacks
dw Pending03EvosAttacks
dw OniyanmaEvosAttacks
dw WooperEvosAttacks
dw QuagsireEvosAttacks
dw EspeonEvosAttacks
@ -618,8 +618,9 @@ CrobatEvosAttacks:
dbw 31, THRASH ; RG proto
dbw 37, CONFUSION ; RG proto
dbw 41, MEAN_LOOK
dbw 47, HAZE
dbw 53, MOONLIGHT ; SW97
dbw 49, WIND_RIDE
dbw 56, HAZE
dbw 60, MOONLIGHT ; SW97
db 0 ; no more level-up moves
ChinchouEvosAttacks:
@ -664,8 +665,9 @@ ReroadEvosAttacks:
dbw 34, BUBBLEBEAM
dbw 38, SING
dbw 43, ENCORE
dbw 49, SCREECH
dbw 55, HORN_DRILL
dbw 49, BOUNCE
dbw 55, SCREECH
dbw 60, HORN_DRILL
db 0 ; no more level-up moves
PichuEvosAttacks:
@ -899,6 +901,7 @@ AzurillEvosAttacks:
db 0 ; no more evolutions
dbw 1, SPLASH
dbw 1, POUND ; SW97
dbw 1, WATER_SPORT
dbw 3, CHARM
dbw 6, TAIL_WHIP
dbw 10, BUBBLE
@ -910,6 +913,7 @@ MarillEvosAttacks:
dbbw EVOLVE_LEVEL, 18, AZUMARILL
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, WATER_SPORT
dbw 5, DEFENSE_CURL
dbw 9, TAIL_WHIP
dbw 13, WATER_GUN
@ -917,7 +921,8 @@ MarillEvosAttacks:
dbw 25, SLAM ; from Azurill
dbw 30, BUBBLEBEAM
dbw 36, DOUBLE_EDGE
dbw 42, RAIN_DANCE
dbw 40, BOUNCE
dbw 44, RAIN_DANCE
dbw 48, PLAY_ROUGH ; XY
dbw 54, HYDRO_PUMP ; FRLG
db 0 ; no more level-up moves
@ -925,6 +930,7 @@ MarillEvosAttacks:
AzumarillEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, WATER_SPORT
dbw 5, DEFENSE_CURL
dbw 9, TAIL_WHIP
dbw 13, WATER_GUN
@ -932,8 +938,9 @@ AzumarillEvosAttacks:
dbw 27, SLAM ; from Azurill
dbw 32, BUBBLEBEAM
dbw 40, DOUBLE_EDGE
dbw 46, RAIN_DANCE
dbw 52, PLAY_ROUGH ; XY
dbw 44, BOUNCE
dbw 48, RAIN_DANCE
dbw 54, PLAY_ROUGH ; XY
dbw 60, HYDRO_PUMP ; FRLG
db 0 ; no more level-up moves
@ -949,7 +956,8 @@ BonslyEvosAttacks:
dbw 29, ROCK_SLIDE
dbw 35, SLAM
dbw 41, DOUBLE_EDGE ; FRLG
dbw 47, COUNTER ; FRLG move tutor
dbw 47, UPROOT
dbw 52, COUNTER ; FRLG move tutor
db 0 ; no more level-up moves
SudowoodoEvosAttacks:
@ -963,7 +971,8 @@ SudowoodoEvosAttacks:
dbw 31, ROCK_SLIDE
dbw 39, SLAM
dbw 45, DOUBLE_EDGE ; FRLG
dbw 53, COUNTER ; FRLG move tutor
dbw 53, UPROOT
dbw 58, COUNTER ; FRLG move tutor
db 0 ; no more level-up moves
PolitoedEvosAttacks:
@ -973,6 +982,7 @@ PolitoedEvosAttacks:
dbw 1, DOUBLESLAP
dbw 1, SUPERSONIC ; RG proto
dbw 35, PERISH_SONG
dbw 43, BOUNCE
dbw 51, SWAGGER
db 0 ; no more level-up moves
@ -994,6 +1004,7 @@ HoppipEvosAttacks:
dbw 35, GROWTH ; SW97
dbw 39, RAZOR_LEAF ; SW97
dbw 45, COTTON_SPORE
dbw 50, WIND_RIDE
db 0 ; no more level-up moves
SkiploomEvosAttacks:
@ -1014,6 +1025,7 @@ SkiploomEvosAttacks:
dbw 39, GROWTH ; SW97
dbw 43, RAZOR_LEAF ; SW97
dbw 49, COTTON_SPORE
dbw 56, WIND_RIDE
db 0 ; no more level-up moves
JumpluffEvosAttacks:
@ -1033,6 +1045,7 @@ JumpluffEvosAttacks:
dbw 41, GROWTH ; SW97
dbw 47, RAZOR_LEAF ; SW97
dbw 53, COTTON_SPORE
dbw 60, WIND_RIDE
db 0 ; no more level-up moves
AipomEvosAttacks:
@ -1170,21 +1183,22 @@ FoxfireEvosAttacks:
YanmaEvosAttacks:
dbbw EVOLVE_LEVEL, 35, YANMEGA ; to be changed
dbbw EVOLVE_LEVEL, 10, PENDING03 ; to be changed
dbbw EVOLVE_LEVEL, 10, ONIYANMA ; to be changed
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
dbw 6, QUICK_ATTACK
dbw 12, DOUBLE_TEAM
dbw 17, SONICBOOM
dbw 22, HYPNOSIS ; FRLG
dbw 26, DETECT
dbw 22, WING_ATTACK
dbw 26, HYPNOSIS ; FRLG
dbw 30, SUPERSONIC
dbw 35, ANCIENTPOWER ; HGSS
dbw 38, WING_ATTACK
dbw 42, SWIFT
dbw 39, DETECT
dbw 43, SWIFT
dbw 48, PURSUIT ; HGSS
dbw 54, SCREECH
dbw 52, WIND_RIDE
dbw 56, SCREECH
db 0 ; no more level-up moves
YanmegaEvosAttacks:
@ -1194,35 +1208,37 @@ YanmegaEvosAttacks:
dbw 6, QUICK_ATTACK
dbw 12, DOUBLE_TEAM
dbw 17, SONICBOOM
dbw 22, HYPNOSIS ; FRLG
dbw 26, DETECT
dbw 22, WING_ATTACK
dbw 26, HYPNOSIS ; FRLG
dbw 30, SUPERSONIC
dbw 35, ANCIENTPOWER ; HGSS
dbw 40, WING_ATTACK
dbw 44, SWIFT
dbw 52, PURSUIT ; HGSS
dbw 58, SCREECH
dbw 63, SLASH
dbw 41, DETECT
dbw 45, SWIFT
dbw 50, PURSUIT ; HGSS
dbw 56, WIND_RIDE
dbw 60, SCREECH
dbw 65, SLASH
db 0 ; no more level-up moves
Pending03EvosAttacks:
OniyanmaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, FORESIGHT
dbw 6, QUICK_ATTACK
dbw 12, DOUBLE_TEAM
dbw 17, SONICBOOM
dbw 22, HYPNOSIS ; FRLG
dbw 26, DETECT
dbw 22, WING_ATTACK
dbw 26, HYPNOSIS ; FRLG
dbw 30, SUPERSONIC
dbw 35, POISONPOWDER
dbw 35, SLEEP_POWDER
dbw 35, STUN_SPORE
dbw 40, WING_ATTACK
dbw 44, SWIFT
dbw 52, PURSUIT ; HGSS
dbw 58, SCREECH
dbw 63, SLAM
dbw 41, DETECT
dbw 45, SWIFT
dbw 50, PURSUIT ; HGSS
dbw 56, WIND_RIDE
dbw 60, SCREECH
dbw 65, THUNDER
db 0 ; no more level-up moves
WooperEvosAttacks:
@ -1782,6 +1798,7 @@ HeracrossEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, LEER
dbw 1, UPPERCUT
dbw 6, HORN_ATTACK
dbw 12, ENDURE
dbw 18, FURY_ATTACK
@ -1824,9 +1841,10 @@ TeddiursaEvosAttacks:
dbw 31, SLASH
dbw 37, MOONLIGHT ; from BM Ursaluna
dbw 43, SNORE
dbw 47, THRASH
dbw 51, PLAY_ROUGH ; PLA
dbw 54, DOUBLE_EDGE ; PLA
dbw 47, UPROOT
dbw 51, THRASH
dbw 55, PLAY_ROUGH ; PLA
dbw 59, DOUBLE_EDGE ; PLA
db 0 ; no more level-up moves
UrsaringEvosAttacks:
@ -1841,9 +1859,10 @@ UrsaringEvosAttacks:
dbw 33, SLASH
dbw 39, MOONLIGHT ; from BM Ursaluna
dbw 45, SNORE
dbw 51, THRASH
dbw 55, PLAY_ROUGH ; PLA
dbw 60, DOUBLE_EDGE ; PLA
dbw 51, UPROOT
dbw 55, THRASH
dbw 59, PLAY_ROUGH ; PLA
dbw 65, DOUBLE_EDGE ; PLA
db 0 ; no more level-up moves
UrsalunaEvosAttacks:
@ -1855,12 +1874,13 @@ UrsalunaEvosAttacks:
dbw 20, FAINT_ATTACK
dbw 25, REST
dbw 33, SLASH
dbw 39, MOONLIGHT ; from BM Ursaluna
dbw 39, MOONLIGHT
dbw 45, SNORE
dbw 51, THRASH
dbw 55, PLAY_ROUGH
dbw 60, DOUBLE_EDGE
dbw 65, EARTHQUAKE
dbw 51, UPROOT
dbw 55, THRASH
dbw 59, PLAY_ROUGH
dbw 65, DOUBLE_EDGE
dbw 70, EARTHQUAKE
db 0 ; no more level-up moves
SlugmaEvosAttacks:
@ -2077,9 +2097,10 @@ MantykeEvosAttacks:
dbw 25, TAKE_DOWN
dbw 29, WING_ATTACK
dbw 34, AGILITY
dbw 39, CONFUSE_RAY
dbw 45, THRASH ; SW97
dbw 51, HYDRO_PUMP ; SW97
dbw 39, BOUNCE
dbw 45, CONFUSE_RAY
dbw 50, THRASH ; SW97
dbw 54, HYDRO_PUMP ; SW97
db 0 ; no more level-up moves
MantineEvosAttacks:
@ -2093,9 +2114,10 @@ MantineEvosAttacks:
dbw 25, TAKE_DOWN
dbw 29, WING_ATTACK
dbw 36, AGILITY
dbw 41, CONFUSE_RAY
dbw 49, THRASH ; SW97
dbw 55, HYDRO_PUMP ; SW97
dbw 41, BOUNCE
dbw 49, CONFUSE_RAY
dbw 54, THRASH ; SW97
dbw 60, HYDRO_PUMP ; SW97
db 0 ; no more level-up moves
SkarmoryEvosAttacks:
@ -2173,10 +2195,11 @@ PhanpyEvosAttacks:
dbw 26, STOMP ; SW97
dbw 31, TAKE_DOWN
dbw 35, PROTECT ; SW97
dbw 40, ENDURE
dbw 44, RAPID_SPIN ; from Donphan
dbw 49, DOUBLE_EDGE
dbw 55, EARTHQUAKE ; from Donphan
dbw 40, UPROOT
dbw 44, ENDURE
dbw 49, RAPID_SPIN ; from Donphan
dbw 55, DOUBLE_EDGE
dbw 59, EARTHQUAKE ; from Donphan
db 0 ; no more level-up moves
DonphanEvosAttacks:
@ -2191,10 +2214,11 @@ DonphanEvosAttacks:
dbw 28, STOMP ; SW97
dbw 33, TAKE_DOWN ; from Phanpy
dbw 37, PROTECT ; SW97
dbw 44, ENDURE ; from Phanpy
dbw 48, RAPID_SPIN
dbw 53, DOUBLE_EDGE ; from Phanpy
dbw 61, EARTHQUAKE
dbw 44, UPROOT
dbw 48, ENDURE ; from Phanpy
dbw 53, RAPID_SPIN
dbw 61, DOUBLE_EDGE ; from Phanpy
dbw 65, EARTHQUAKE
db 0 ; no more level-up moves
Porygon2EvosAttacks:
@ -2437,7 +2461,8 @@ SoneggEvosAttacks:
dbw 32, ENCORE
dbw 38, MIRROR_MOVE
dbw 44, EGG_BOMB
dbw 50, DOUBLE_EDGE
dbw 50, WIND_RIDE
dbw 56, DOUBLE_EDGE
db 0 ; no more level-up moves
CacawphonyEvosAttacks:
@ -2453,7 +2478,8 @@ CacawphonyEvosAttacks:
dbw 34, ENCORE
dbw 40, MIRROR_MOVE
dbw 48, EGG_BOMB
dbw 54, DOUBLE_EDGE
dbw 54, WIND_RIDE
dbw 60, DOUBLE_EDGE
db 0 ; no more level-up moves
TrebirEvosAttacks:
@ -2469,7 +2495,8 @@ TrebirEvosAttacks:
dbw 34, ENCORE
dbw 40, MIRROR_MOVE
dbw 48, EGG_BOMB
dbw 54, HEAL_BELL
dbw 54, WIND_RIDE
dbw 60, HEAL_BELL
db 0 ; no more level-up moves
SakurazeEvosAttacks:
@ -2612,16 +2639,17 @@ EucalaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 8, FURY_SWIPES
dbw 14, RAZOR_LEAF
dbw 20, RAPID_SPIN
dbw 26, SCREECH
dbw 32, SLAM
dbw 38, POISONPOWDER
dbw 38, STUN_SPORE
dbw 38, SLEEP_POWDER
dbw 44, THRASH
dbw 50, PETAL_DANCE
dbw 8, RAPID_SPIN
dbw 14, BRIGHT_MOSS
dbw 20, RAZOR_LEAF
dbw 26, FURY_SWIPES
dbw 32, SCREECH
dbw 38, SLAM
dbw 44, POISONPOWDER
dbw 44, STUN_SPORE
dbw 44, SLEEP_POWDER
dbw 50, THRASH
dbw 55, PETAL_DANCE
db 0 ; no more level-up moves
KiwookedEvosAttacks:
@ -2665,8 +2693,9 @@ KitsenEvosAttacks:
dbw 30, CURSE
dbw 36, HYPNOSIS
dbw 42, THIEF
dbw 48, DESTINY_BOND
dbw 54, FUTURE_SIGHT
dbw 48, WIND_RIDE
dbw 54, DESTINY_BOND
dbw 60, FUTURE_SIGHT
db 0 ; no more level-up moves
WispiritEvosAttacks:

177
data/pokemon/evos_attacks_kanto.asm
View file

@ -351,8 +351,9 @@ SquirtleEvosAttacks:
dbw 7, ABSORB ; New!
dbw 11, WITHDRAW
dbw 14, BUBBLEBEAM ; RG proto
dbw 17, COMET_PUNCH ; RG proto
dbw 22, RAPID_SPIN
dbw 17, BRIGHT_MOSS
dbw 20, COMET_PUNCH ; RG proto
dbw 23, RAPID_SPIN
dbw 26, MEGA_DRAIN ; New!
dbw 31, STOMP ; RG proto
dbw 36, SYNTHESIS ; New!
@ -368,12 +369,13 @@ WartortleEvosAttacks:
dbw 7, ABSORB ; New!
dbw 11, WITHDRAW
dbw 14, BUBBLEBEAM ; RG proto
dbw 19, COMET_PUNCH ; RG proto
dbw 24, RAPID_SPIN
dbw 28, MEGA_DRAIN ; New!
dbw 19, BRIGHT_MOSS
dbw 22, COMET_PUNCH ; RG proto
dbw 27, RAPID_SPIN
dbw 30, MEGA_DRAIN ; New!
dbw 35, STOMP ; RG proto
dbw 40, SYNTHESIS ; New!
dbw 45, PETAL_DANCE ; New!
dbw 47, PETAL_DANCE ; New!
dbw 53, WATERFALL ; New!
db 0 ; no more level-up moves
@ -384,14 +386,15 @@ TotartleEvosAttacks:
dbw 7, ABSORB ; New!
dbw 11, WITHDRAW
dbw 14, BUBBLEBEAM ; RG proto
dbw 19, COMET_PUNCH ; RG proto
dbw 24, RAPID_SPIN
dbw 28, MEGA_DRAIN ; New!
dbw 19, BRIGHT_MOSS
dbw 22, COMET_PUNCH ; RG proto
dbw 27, RAPID_SPIN
dbw 30, MEGA_DRAIN ; New!
dbw 35, STOMP ; RG proto
dbw 36, MEGA_PUNCH ; RG proto
dbw 42, SYNTHESIS ; New!
dbw 47, PETAL_DANCE ; New!
dbw 55, WATERFALL ; New!
dbw 49, PETAL_DANCE ; New!
dbw 57, WATERFALL ; New!
dbw 65, BLIZZARD ; RG proto
db 0 ; no more level-up moves
@ -976,7 +979,8 @@ BittybatEvosAttacks:
dbw 26, THRASH ; RG proto
dbw 31, CONFUSION ; RG proto
dbw 35, MEAN_LOOK
dbw 41, HAZE
dbw 41, WIND_RIDE
dbw 46, HAZE
db 0 ; no more level-up moves
ZubatEvosAttacks:
@ -990,7 +994,8 @@ ZubatEvosAttacks:
dbw 28, THRASH ; RG proto
dbw 35, CONFUSION ; RG proto
dbw 39, MEAN_LOOK
dbw 45, HAZE
dbw 45, WIND_RIDE
dbw 52, HAZE
db 0 ; no more level-up moves
GolbatEvosAttacks:
@ -1006,7 +1011,8 @@ GolbatEvosAttacks:
dbw 31, THRASH ; RG proto
dbw 37, CONFUSION ; RG proto
dbw 41, MEAN_LOOK
dbw 47, HAZE
dbw 49, WIND_RIDE
dbw 56, HAZE
db 0 ; no more level-up moves
OddishEvosAttacks:
@ -1014,6 +1020,7 @@ OddishEvosAttacks:
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 7, SWEET_SCENT
dbw 11, BRIGHT_MOSS
dbw 14, POISONPOWDER
dbw 16, STUN_SPORE
dbw 18, SLEEP_POWDER
@ -1032,6 +1039,7 @@ GloomEvosAttacks:
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 7, SWEET_SCENT
dbw 11, BRIGHT_MOSS
dbw 14, POISONPOWDER
dbw 16, STUN_SPORE
dbw 18, SLEEP_POWDER
@ -1058,8 +1066,9 @@ ParasporEvosAttacks:
db 0 ; no more evolutions
dbw 1, ABSORB
dbw 1, SCRATCH
dbw 7, STUN_SPORE
dbw 13, POISONPOWDER
dbw 7, BRIGHT_MOSS
dbw 11, STUN_SPORE
dbw 14, POISONPOWDER
dbw 17, LEECH_LIFE
dbw 21, SPORE
dbw 25, FURY_SWIPES ; SW97
@ -1074,8 +1083,9 @@ ParasEvosAttacks:
db 0 ; no more evolutions
dbw 1, ABSORB ; RG proto
dbw 1, SCRATCH
dbw 7, STUN_SPORE
dbw 13, POISONPOWDER
dbw 7, BRIGHT_MOSS
dbw 11, STUN_SPORE
dbw 14, POISONPOWDER
dbw 19, LEECH_LIFE
dbw 23, SPORE
dbw 27, FURY_SWIPES ; SW97
@ -1089,8 +1099,9 @@ ParasectEvosAttacks:
db 0 ; no more evolutions
dbw 1, ABSORB ; RG proto
dbw 1, SCRATCH
dbw 7, STUN_SPORE
dbw 13, POISONPOWDER
dbw 7, BRIGHT_MOSS
dbw 11, STUN_SPORE
dbw 14, POISONPOWDER
dbw 19, LEECH_LIFE
dbw 23, SPORE
dbw 29, FURY_SWIPES ; SW97
@ -1231,6 +1242,7 @@ PsyduckEvosAttacks:
dbbw EVOLVE_LEVEL, 22, WEIRDUCK
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, WATER_SPORT
dbw 5, TAIL_WHIP
dbw 10, DISABLE
dbw 14, WATER_GUN ; SW97
@ -1249,6 +1261,7 @@ WeirduckEvosAttacks:
dbbw EVOLVE_LEVEL, 35, GOLDUCK
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, WATER_SPORT
dbw 5, TAIL_WHIP
dbw 10, DISABLE
dbw 14, WATER_GUN ; SW97
@ -1267,6 +1280,7 @@ WeirduckEvosAttacks:
GolduckEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, WATER_SPORT
dbw 5, TAIL_WHIP
dbw 10, DISABLE
dbw 14, WATER_GUN ; SW97
@ -1384,6 +1398,7 @@ PoliwagEvosAttacks:
dbbw EVOLVE_LEVEL, 25, POLIWHIRL
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, WATER_SPORT
dbw 7, HYPNOSIS
dbw 13, WATER_GUN
dbw 19, DOUBLESLAP
@ -1401,6 +1416,7 @@ PoliwhirlEvosAttacks:
dbbw EVOLVE_ITEM, HEART_STONE, POLITOED
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, WATER_SPORT
dbw 7, HYPNOSIS
dbw 13, WATER_GUN
dbw 19, DOUBLESLAP
@ -1420,6 +1436,7 @@ PoliwrathEvosAttacks:
dbw 1, DOUBLESLAP
dbw 1, LOW_KICK ; SW97
dbw 35, SUBMISSION
dbw 43, STRONG_ARM
dbw 51, MIND_READER
db 0 ; no more level-up moves
@ -1477,7 +1494,8 @@ MachopEvosAttacks:
dbw 37, CROSS_CHOP
dbw 43, SCARY_FACE
dbw 49, SUBMISSION
dbw 54, DYNAMICPUNCH ; FRLG
dbw 54, STRONG_ARM
dbw 59, DYNAMICPUNCH ; FRLG
db 0 ; no more level-up moves
MachokeEvosAttacks:
@ -1495,7 +1513,8 @@ MachokeEvosAttacks:
dbw 39, CROSS_CHOP
dbw 45, SCARY_FACE
dbw 53, SUBMISSION
dbw 58, DYNAMICPUNCH ; FRLG
dbw 58, STRONG_ARM
dbw 63, DYNAMICPUNCH ; FRLG
db 0 ; no more level-up moves
MachampEvosAttacks:
@ -1512,7 +1531,8 @@ MachampEvosAttacks:
dbw 39, CROSS_CHOP
dbw 45, SCARY_FACE
dbw 53, SUBMISSION
dbw 58, DYNAMICPUNCH ; FRLG
dbw 58, STRONG_ARM
dbw 63, DYNAMICPUNCH ; FRLG
db 0 ; no more level-up moves
BellsproutEvosAttacks:
@ -1528,7 +1548,8 @@ BellsproutEvosAttacks:
dbw 27, FALSE_SWIPE ; SW97
dbw 33, SWEET_SCENT
dbw 37, RAZOR_LEAF
dbw 42, SLAM
dbw 42, UPROOT
dbw 48, SLAM
db 0 ; no more level-up moves
WeepinbellEvosAttacks:
@ -1545,7 +1566,8 @@ WeepinbellEvosAttacks:
dbw 29, FALSE_SWIPE ; SW97
dbw 35, SWEET_SCENT
dbw 41, RAZOR_LEAF
dbw 46, SLAM
dbw 46, UPROOT
dbw 52, SLAM
db 0 ; no more level-up moves
VictreebelEvosAttacks:
@ -1673,7 +1695,8 @@ GeodudeEvosAttacks:
dbw 37, EARTHQUAKE
dbw 41, EXPLOSION
dbw 46, ROCK_HEAD
dbw 52, FISSURE ; RG proto
dbw 52, STRONG_ARM
dbw 58, FISSURE ; RG proto
db 0 ; no more level-up moves
GravelerEvosAttacks:
@ -1690,7 +1713,8 @@ GravelerEvosAttacks:
dbw 41, EARTHQUAKE
dbw 45, EXPLOSION
dbw 50, ROCK_HEAD
dbw 58, FISSURE ; RG proto
dbw 58, STRONG_ARM
dbw 64, FISSURE ; RG proto
db 0 ; no more level-up moves
GolemEvosAttacks:
@ -1706,7 +1730,8 @@ GolemEvosAttacks:
dbw 41, EARTHQUAKE
dbw 45, EXPLOSION
dbw 50, ROCK_HEAD
dbw 58, FISSURE ; RG proto
dbw 58, STRONG_ARM
dbw 64, FISSURE ; RG proto
db 0 ; no more level-up moves
KoltaEvosAttacks:
@ -1896,6 +1921,7 @@ CheepEvosAttacks:
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, PECK
dbw 1, WATER_SPORT
dbw 5, DOUBLE_KICK
dbw 11, COUNTER
dbw 16, BUBBLEBEAM
@ -1912,6 +1938,7 @@ JabettaEvosAttacks:
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, PECK
dbw 1, WATER_SPORT
dbw 5, DOUBLE_KICK
dbw 11, COUNTER
dbw 16, BUBBLEBEAM
@ -1934,9 +1961,10 @@ RibbitoEvosAttacks:
dbw 19, WATER_GUN
dbw 24, FAINT_ATTACK
dbw 30, SUBSTITUTE
dbw 36, VITAL_THROW
dbw 42, BELLY_DRUM
dbw 48, HYDRO_PUMP
dbw 36, BOUNCE
dbw 42, VITAL_THROW
dbw 48, BELLY_DRUM
dbw 54, HYDRO_PUMP
db 0 ; no more level-up moves
CroakozunaEvosAttacks:
@ -1948,9 +1976,10 @@ CroakozunaEvosAttacks:
dbw 19, WATER_GUN
dbw 24, FAINT_ATTACK
dbw 32, SUBSTITUTE
dbw 38, VITAL_THROW
dbw 46, BELLY_DRUM
dbw 52, HYDRO_PUMP
dbw 38, BOUNCE
dbw 46, VITAL_THROW
dbw 52, BELLY_DRUM
dbw 60, HYDRO_PUMP
db 0 ; no more level-up moves
FarfetchDEvosAttacks:
@ -2020,7 +2049,8 @@ SeelEvosAttacks:
db 0 ; no more evolutions
dbw 1, HEADBUTT
dbw 1, GROWL
dbw 10, POWDER_SNOW ; SW97
dbw 7, WATER_SPORT
dbw 12, POWDER_SNOW ; SW97
dbw 16, ICY_WIND ; FRLG
dbw 21, REST
dbw 27, AURORA_BEAM
@ -2035,7 +2065,8 @@ DewgongEvosAttacks:
db 0 ; no more evolutions
dbw 1, HEADBUTT
dbw 1, GROWL
dbw 10, POWDER_SNOW ; SW97
dbw 7, WATER_SPORT
dbw 12, POWDER_SNOW ; SW97
dbw 16, ICY_WIND ; FRLG
dbw 21, REST
dbw 27, AURORA_BEAM
@ -2421,6 +2452,7 @@ LickitungEvosAttacks:
dbbw EVOLVE_TRADE, KINGS_ROCK, LICKILORD
db 0 ; no more evolutions
dbw 1, LICK
dbw 1, MEGAPHONE
dbw 7, SUPERSONIC
dbw 13, DEFENSE_CURL
dbw 19, STOMP
@ -2434,6 +2466,7 @@ LickitungEvosAttacks:
LickilickyEvosAttacks:
db 0 ; no more evolutions
dbw 1, LICK
dbw 1, MEGAPHONE
dbw 7, SUPERSONIC
dbw 13, DEFENSE_CURL
dbw 19, STOMP
@ -2450,6 +2483,7 @@ LickilordEvosAttacks: ; SW97 learnset + some poison stuff
dbw 1, ACID
dbw 1, LICK
dbw 1, TOXIC
dbw 1, MEGAPHONE
dbw 7, SUPERSONIC
dbw 13, DEFENSE_CURL
dbw 19, STOMP
@ -2499,9 +2533,10 @@ RhyhornEvosAttacks:
dbw 7, MUD_SLAP ; SW97
dbw 13, STOMP
dbw 19, FURY_ATTACK
dbw 25, ENDURE ; SW97
dbw 31, SCARY_FACE
dbw 37, TAKE_DOWN
dbw 24, ENDURE ; SW97
dbw 28, SCARY_FACE
dbw 32, TAKE_DOWN
dbw 37, UPROOT
dbw 43, ROCK_HEAD
dbw 49, HORN_DRILL
dbw 55, EARTHQUAKE
@ -2515,9 +2550,10 @@ RhydonEvosAttacks:
dbw 7, MUD_SLAP ; SW97
dbw 13, STOMP
dbw 19, FURY_ATTACK
dbw 25, ENDURE ; SW97
dbw 31, SCARY_FACE
dbw 37, TAKE_DOWN
dbw 24, ENDURE ; SW97
dbw 28, SCARY_FACE
dbw 32, TAKE_DOWN
dbw 37, UPROOT
dbw 43, ROCK_HEAD
dbw 49, HORN_DRILL
dbw 55, EARTHQUAKE
@ -2561,10 +2597,11 @@ BurgelaEvosAttacks:
dbw 19, VINE_WHIP
dbw 24, BIND
dbw 28, MEGA_DRAIN
dbw 33, STUN_SPORE
dbw 38, SLAM
dbw 43, GROWTH
dbw 48, GIGA_DRAIN
dbw 33, UPROOT
dbw 38, STUN_SPORE
dbw 42, SLAM
dbw 46, GROWTH
dbw 50, GIGA_DRAIN
db 0 ; no more level-up moves
TangelaEvosAttacks:
@ -2578,10 +2615,11 @@ TangelaEvosAttacks:
dbw 19, VINE_WHIP
dbw 26, BIND
dbw 30, MEGA_DRAIN
dbw 35, STUN_SPORE
dbw 42, SLAM
dbw 47, GROWTH
dbw 52, GIGA_DRAIN ; Later gen level-up & TM
dbw 35, UPROOT
dbw 42, STUN_SPORE
dbw 46, SLAM
dbw 50, GROWTH
dbw 56, GIGA_DRAIN ; Later gen level-up & TM
db 0 ; no more level-up moves
TangrowthEvosAttacks:
@ -2593,29 +2631,30 @@ TangrowthEvosAttacks:
dbw 19, VINE_WHIP
dbw 26, BIND
dbw 30, MEGA_DRAIN
dbw 35, STUN_SPORE
dbw 42, SLAM
dbw 35, UPROOT
dbw 42, STUN_SPORE
dbw 44, ANCIENTPOWER
dbw 49, GROWTH
dbw 56, GIGA_DRAIN ; Later gen level-up & TM
dbw 48, SLAM
dbw 52, GROWTH
dbw 60, GIGA_DRAIN ; Later gen level-up & TM
db 0 ; no more level-up moves
JungelaEvosAttacks:
db 0 ; no more evolutions
dbw 1, CONSTRICT
dbw 1, BITE
dbw 5, SLEEP_POWDER
dbw 10, ABSORB
dbw 15, POISONPOWDER
dbw 19, VINE_WHIP
dbw 26, BIND
dbw 30, MEGA_DRAIN
dbw 35, STUN_SPORE
dbw 42, SLAM
dbw 35, BITE
dbw 42, STUN_SPORE
dbw 44, PURSUIT
dbw 49, GROWTH
dbw 56, GIGA_DRAIN ; Later gen level-up & TM
dbw 62, CRUNCH
dbw 48, SLAM
dbw 52, GROWTH
dbw 60, GIGA_DRAIN ; Later gen level-up & TM
dbw 65, CRUNCH
db 0 ; no more level-up moves
KangaskhanEvosAttacks:
@ -2624,12 +2663,13 @@ KangaskhanEvosAttacks:
dbw 7, LEER
dbw 13, BITE
dbw 19, TAIL_WHIP
dbw 25, MEGA_PUNCH
dbw 25, RAGE
dbw 31, PROTECT ; SW97
dbw 37, RAGE
dbw 37, DIZZY_PUNCH
dbw 43, ENDURE
dbw 49, DIZZY_PUNCH
dbw 55, REVERSAL
dbw 49, MEGA_PUNCH
dbw 55, STRONG_ARM
dbw 61, REVERSAL
db 0 ; no more level-up moves
HorseaEvosAttacks:
@ -2708,6 +2748,7 @@ OrfryEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, TAIL_WHIP
dbw 5, WATER_SPORT
dbw 10, SUPERSONIC
dbw 15, HORN_ATTACK
dbw 22, FLAIL
@ -2724,6 +2765,7 @@ GoldeenEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, TAIL_WHIP
dbw 5, WATER_SPORT
dbw 10, SUPERSONIC
dbw 15, HORN_ATTACK
dbw 24, FLAIL
@ -2740,6 +2782,7 @@ SeakingEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, TAIL_WHIP
dbw 5, WATER_SPORT
dbw 10, SUPERSONIC
dbw 15, HORN_ATTACK
dbw 24, FLAIL
@ -2968,6 +3011,7 @@ PinsirEvosAttacks:
dbw 43, SWORDS_DANCE
dbw 49, GUILLOTINE
dbw 55, SLASH ; SW97, RBY
dbw 60, STRONG_ARM
db 0 ; no more level-up moves
TriculesEvosAttacks:
@ -2983,7 +3027,8 @@ TriculesEvosAttacks:
dbw 43, SWORDS_DANCE
dbw 49, GUILLOTINE
dbw 55, SLASH ; SW97, RBY
dbw 60, MEGAHORN ; due to its connection to Heracross (and giant horn)
dbw 60, STRONG_ARM
dbw 65, MEGAHORN ; due to its connection to Heracross (and giant horn)
db 0 ; no more level-up moves
TaurosEvosAttacks:
@ -3266,6 +3311,7 @@ DecillaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 1, MEGAPHONE
dbw 8, SUBSTITUTE
dbw 15, SCREECH
dbw 22, ROCK_THROW
@ -3281,6 +3327,7 @@ GawarhedEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 1, MEGAPHONE
dbw 8, SUBSTITUTE
dbw 15, SCREECH
dbw 22, ROCK_THROW

2
data/pokemon/menu_icons.asm
View file

@ -277,7 +277,7 @@ MonMenuIcons:
db ICON_FOX ; FOXFIRE
db ICON_BUG ; YANMA
db ICON_BUG ; YANMEGA
db ICON_BUG ; PENDING03
db ICON_BUG ; ONIYANMA
db ICON_MONSTER ; WOOPER
db ICON_MONSTER ; QUAGSIRE
db ICON_FOX ; ESPEON

2
data/pokemon/names.asm
View file

@ -279,7 +279,7 @@ PokemonNames::
db "FOXFIRE@@@"
db "YANMA@@@@@"
db "YANMEGA@@@"
db "PENDING03@"
db "ONIYANMA@@"
db "WOOPER@@@@"
db "QUAGSIRE@@"
db "ESPEON@@@@"

4
data/pokemon/palettes.asm
View file

@ -583,8 +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/oniyanma/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/oniyanma/shiny.pal"
INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wooper/shiny.pal"
INCBIN "gfx/pokemon/quagsire/front.gbcpal", middle_colors

4
data/pokemon/pic_pointers.asm
View file

@ -563,8 +563,8 @@ PokemonPicPointers::
dba YanmaBackpic
dba YanmegaFrontpic
dba YanmegaBackpic
dba Pending03Frontpic
dba Pending03Backpic
dba OniyanmaFrontpic
dba OniyanmaBackpic
dba WooperFrontpic
dba WooperBackpic
dba QuagsireFrontpic

0
gfx/footprints/pending03.png → gfx/footprints/oniyanma.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

2
gfx/footprints_johto.asm
View file

@ -64,7 +64,7 @@ INCBIN "gfx/footprints/aercrow.1bpp"
INCBIN "gfx/footprints/foxfire.1bpp"
INCBIN "gfx/footprints/yanma.1bpp"
INCBIN "gfx/footprints/yanmega.1bpp"
INCBIN "gfx/footprints/pending03.1bpp"
INCBIN "gfx/footprints/oniyanma.1bpp"
INCBIN "gfx/footprints/wooper.1bpp"
INCBIN "gfx/footprints/quagsire.1bpp"
INCBIN "gfx/footprints/espeon.1bpp"

4
gfx/pics.asm
View file

@ -852,8 +852,8 @@ FoxfireFrontpic: INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
FoxfireBackpic: INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
YanmegaFrontpic: INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
YanmegaBackpic: INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
Pending03Frontpic: INCBIN "gfx/pokemon/pending03/front.animated.2bpp.lz"
Pending03Backpic: INCBIN "gfx/pokemon/pending03/back.2bpp.lz"
OniyanmaFrontpic: INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz"
OniyanmaBackpic: INCBIN "gfx/pokemon/oniyanma/back.2bpp.lz"
KazappelinFrontpic: INCBIN "gfx/pokemon/kazappelin/front.animated.2bpp.lz"
KazappelinBackpic: INCBIN "gfx/pokemon/kazappelin/back.2bpp.lz"
QwilfatherFrontpic: INCBIN "gfx/pokemon/qwilfather/front.animated.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -275,7 +275,7 @@ AnimationPointers:
dw FoxfireAnimation
dw YanmaAnimation
dw YanmegaAnimation
dw Pending03Animation
dw OniyanmaAnimation
dw WooperAnimation
dw QuagsireAnimation
dw EspeonAnimation

2
gfx/pokemon/anims.asm
View file

@ -273,7 +273,7 @@ AercrowAnimation: INCLUDE "gfx/pokemon/aercrow/anim.asm"
FoxfireAnimation: INCLUDE "gfx/pokemon/magneton/anim.asm"
YanmaAnimation: INCLUDE "gfx/pokemon/yanma/anim.asm"
YanmegaAnimation: INCLUDE "gfx/pokemon/yanmega/anim.asm"
Pending03Animation: INCLUDE "gfx/pokemon/pending03/anim.asm"
OniyanmaAnimation: INCLUDE "gfx/pokemon/oniyanma/anim.asm"
WooperAnimation: INCLUDE "gfx/pokemon/wooper/anim.asm"
QuagsireAnimation: INCLUDE "gfx/pokemon/quagsire/anim.asm"
EspeonAnimation: INCLUDE "gfx/pokemon/espeon/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -275,7 +275,7 @@ BitmasksPointers:
dw FoxfireBitmasks
dw YanmaBitmasks
dw YanmegaBitmasks
dw Pending03Bitmasks
dw OniyanmaBitmasks
dw WooperBitmasks
dw QuagsireBitmasks
dw EspeonBitmasks

2
gfx/pokemon/bitmasks.asm
View file

@ -273,7 +273,7 @@ AercrowBitmasks: INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
FoxfireBitmasks: INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
YanmaBitmasks: INCLUDE "gfx/pokemon/yanma/bitmask.asm"
YanmegaBitmasks: INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
Pending03Bitmasks: INCLUDE "gfx/pokemon/pending03/bitmask.asm"
OniyanmaBitmasks: INCLUDE "gfx/pokemon/oniyanma/bitmask.asm"
WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm"
QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
EspeonBitmasks: INCLUDE "gfx/pokemon/espeon/bitmask.asm"

2
gfx/pokemon/frame_pointers.asm
View file

@ -275,7 +275,7 @@ FramesPointers:
dba FoxfireFrames
dba YanmaFrames
dba YanmegaFrames
dba Pending03Frames
dba OniyanmaFrames
dba WooperFrames
dba QuagsireFrames
dba EspeonFrames

2
gfx/pokemon/idle_pointers.asm
View file

@ -275,7 +275,7 @@ AnimationIdlePointers:
dw FoxfireAnimationIdle
dw YanmaAnimationIdle
dw YanmegaAnimationIdle
dw Pending03AnimationIdle
dw OniyanmaAnimationIdle
dw WooperAnimationIdle
dw QuagsireAnimationIdle
dw EspeonAnimationIdle

2
gfx/pokemon/idles.asm
View file

@ -273,7 +273,7 @@ AercrowAnimationIdle: INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
FoxfireAnimationIdle: INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
YanmaAnimationIdle: INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
YanmegaAnimationIdle: INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
Pending03AnimationIdle: INCLUDE "gfx/pokemon/pending03/anim_idle.asm"
OniyanmaAnimationIdle: INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm"
WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
EspeonAnimationIdle: INCLUDE "gfx/pokemon/espeon/anim_idle.asm"

2
gfx/pokemon/johto_frames.asm
View file

@ -63,7 +63,7 @@ AercrowFrames: INCLUDE "gfx/pokemon/aercrow/frames.asm"
FoxfireFrames: INCLUDE "gfx/pokemon/foxfire/frames.asm"
YanmaFrames: INCLUDE "gfx/pokemon/yanma/frames.asm"
YanmegaFrames: INCLUDE "gfx/pokemon/yanmega/frames.asm"
Pending03Frames: INCLUDE "gfx/pokemon/pending03/frames.asm"
OniyanmaFrames: INCLUDE "gfx/pokemon/oniyanma/frames.asm"
WooperFrames: INCLUDE "gfx/pokemon/wooper/frames.asm"
QuagsireFrames: INCLUDE "gfx/pokemon/quagsire/frames.asm"
EspeonFrames: INCLUDE "gfx/pokemon/espeon/frames.asm"

0
gfx/pokemon/pending03/anim.asm → gfx/pokemon/oniyanma/anim.asm
View file

0
gfx/pokemon/pending03/anim_idle.asm → gfx/pokemon/oniyanma/anim_idle.asm
View file

0
gfx/pokemon/pending03/back.png → gfx/pokemon/oniyanma/back.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

0
gfx/pokemon/pending03/front.png → gfx/pokemon/oniyanma/front.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

0
gfx/pokemon/pending03/shiny.pal → gfx/pokemon/oniyanma/shiny.pal
View file

4
maps/DebugRoom.asm
View file

@ -8,12 +8,12 @@ DebugRoom_MapScripts:
DebugPokemon1Script:
opentext
getmonname STRING_BUFFER_3, OCTILLERY
getmonname STRING_BUFFER_3, ONIYANMA
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke OCTILLERY, 90, TM_ROCK_SMASH
givepoke ONIYANMA, 65, TM_ROCK_SMASH
closetext
end