mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-06 16:15:24 +13:00
Togekiss!
No sprite yet - someone will need to catch that
This commit is contained in:
parent
c6b2bf0885
commit
5b831b6e81
33 changed files with 76 additions and 3 deletions
|
|
@ -239,6 +239,7 @@ INCLUDE "data/pokemon/base_stats/cleffa.asm"
|
|||
INCLUDE "data/pokemon/base_stats/igglybuff.asm"
|
||||
INCLUDE "data/pokemon/base_stats/togepi.asm"
|
||||
INCLUDE "data/pokemon/base_stats/togetic.asm"
|
||||
INCLUDE "data/pokemon/base_stats/togekiss.asm"
|
||||
INCLUDE "data/pokemon/base_stats/natu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/xatu.asm"
|
||||
INCLUDE "data/pokemon/base_stats/moibelle.asm"
|
||||
|
|
|
|||
21
data/pokemon/base_stats/togekiss.asm
Normal file
21
data/pokemon/base_stats/togekiss.asm
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
db TOGEKISS ; species ID placeholder
|
||||
|
||||
db 85, 50, 95, 80, 120, 115
|
||||
; hp atk def spd sat sdf
|
||||
|
||||
db NORMAL, FLYING ; type
|
||||
db 30 ; catch rate
|
||||
db 220 ; base exp
|
||||
db NO_ITEM, NO_ITEM ; items
|
||||
db GENDER_F12_5 ; gender ratio
|
||||
db 100 ; unknown 1
|
||||
db 10 ; step cycles to hatch
|
||||
db 5 ; unknown 2
|
||||
INCBIN "gfx/pokemon/togekiss/front.dimensions"
|
||||
dw NULL, NULL ; unused (beta front/back pics)
|
||||
db GROWTH_FAST ; growth rate
|
||||
dn EGG_FLYING, EGG_FAIRY ; egg groups
|
||||
|
||||
; tm/hm learnset
|
||||
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER
|
||||
; end
|
||||
|
|
@ -218,6 +218,7 @@ PokemonCries::
|
|||
mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF
|
||||
mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI
|
||||
mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC
|
||||
mon_cry CRY_TOGETIC, 59, 56 ; TOGEKISS (incomplete)
|
||||
mon_cry CRY_NATU, -103, 256 ; NATU
|
||||
mon_cry CRY_NATU, -167, 360 ; XATU
|
||||
mon_cry CRY_NIDORAN_M, 0, 0 ; MOIBELLE (incomplete)
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cleffa.asm"
|
|||
IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm"
|
||||
TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm"
|
||||
TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.asm"
|
||||
TogekissPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togekiss.asm"
|
||||
NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm"
|
||||
XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm"
|
||||
MoibellePokedexEntry:: INCLUDE "data/pokemon/dex_entries/moibelle.asm"
|
||||
|
|
|
|||
10
data/pokemon/dex_entries/togekiss.asm
Normal file
10
data/pokemon/dex_entries/togekiss.asm
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
db "JUBILEE@" ; species name
|
||||
dw 411, 838 ; height, weight
|
||||
|
||||
db "A bringer of peace"
|
||||
next "and happiness, this"
|
||||
next "#MON only appears"
|
||||
|
||||
page "in places without"
|
||||
next "strife. It wants"
|
||||
next "kindness over all.@"
|
||||
|
|
@ -213,6 +213,7 @@ PokedexDataPointerTable:
|
|||
dba IgglybuffPokedexEntry
|
||||
dba TogepiPokedexEntry
|
||||
dba TogeticPokedexEntry
|
||||
dba TogekissPokedexEntry
|
||||
dba NatuPokedexEntry
|
||||
dba XatuPokedexEntry
|
||||
dba MoibellePokedexEntry
|
||||
|
|
|
|||
|
|
@ -303,6 +303,7 @@ AlphabeticalPokedexOrder:
|
|||
dw TENTACRUEL
|
||||
dw TOGEPI
|
||||
dw TOGETIC
|
||||
dw TOGEKISS
|
||||
dw TONQUITO
|
||||
dw TOTARTLE
|
||||
dw TOTODILE
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ NewPokedexOrder:
|
|||
dw WIGGLYTUFF
|
||||
dw TOGEPI
|
||||
dw TOGETIC
|
||||
dw TOGEKISS
|
||||
dw SANDSHREW
|
||||
dw SANDSLASH
|
||||
dw EKANS
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ EggMovePointers2::
|
|||
dw IgglybuffEggMoves
|
||||
dw TogepiEggMoves
|
||||
dw NoEggMoves2
|
||||
dw NoEggMoves2
|
||||
dw NatuEggMoves
|
||||
dw NoEggMoves2
|
||||
dw MoibelleEggMoves
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ EvosAttacksPointers2::
|
|||
dw IgglybuffEvosAttacks
|
||||
dw TogepiEvosAttacks
|
||||
dw TogeticEvosAttacks
|
||||
dw TogekissEvosAttacks
|
||||
dw NatuEvosAttacks
|
||||
dw XatuEvosAttacks
|
||||
dw MoibelleEvoAttacks
|
||||
|
|
@ -604,7 +605,8 @@ TogepiEvosAttacks:
|
|||
db 0 ; no more level-up moves
|
||||
|
||||
TogeticEvosAttacks:
|
||||
db 0 ; no more evolutions
|
||||
dbbw EVOLVE_ITEM, SHINY_STONE, TOGEKISS
|
||||
db 0; no more evolutions
|
||||
dbw 1, GROWL
|
||||
dbw 1, CHARM
|
||||
dbw 7, METRONOME
|
||||
|
|
@ -613,6 +615,14 @@ TogeticEvosAttacks:
|
|||
dbw 31, SAFEGUARD
|
||||
dbw 38, DOUBLE_EDGE
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
TogekissEvosAttacks:
|
||||
db 0
|
||||
dbw 1, SKY_ATTACK
|
||||
dbw 1, EXTREMESPEED
|
||||
dbw 1, METRONOME
|
||||
dbw 1, CHARM
|
||||
db 0
|
||||
|
||||
NatuEvosAttacks:
|
||||
dbbw EVOLVE_LEVEL, 25, XATU
|
||||
|
|
@ -1958,7 +1968,8 @@ RuddernautEvosAttacks:
|
|||
db 0 ; no more level-up moves
|
||||
|
||||
XylodonEvosAttacks:
|
||||
db EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions
|
||||
dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions
|
||||
db 0
|
||||
dbw 1, HEADBUTT
|
||||
dbw 1, WITHDRAW
|
||||
dbw 7, ROCK_THROW
|
||||
|
|
|
|||
|
|
@ -213,6 +213,7 @@ FirstEvoStages::
|
|||
dw IGGLYBUFF
|
||||
dw TOGEPI
|
||||
dw TOGEPI ;b0
|
||||
dw TOGEPI
|
||||
dw NATU
|
||||
dw NATU
|
||||
dw MOIBELLE
|
||||
|
|
|
|||
|
|
@ -226,6 +226,7 @@ Pokered_MonIndices:
|
|||
db IGGLYBUFF
|
||||
db TOGEPI
|
||||
db TOGETIC
|
||||
db TOGEKISS
|
||||
db NATU
|
||||
db XATU
|
||||
db MOIBELLE
|
||||
|
|
|
|||
|
|
@ -214,6 +214,7 @@ MonMenuIcons:
|
|||
db ICON_JIGGLYPUFF ; IGGLYBUFF
|
||||
db ICON_CLEFAIRY ; TOGEPI
|
||||
db ICON_BIRD ; TOGETIC
|
||||
db ICON_BIRD ; TOGEKISS
|
||||
db ICON_BIRD ; NATU
|
||||
db ICON_BIRD ; XATU
|
||||
db ICON_FOX ; MOIBELLE
|
||||
|
|
|
|||
|
|
@ -216,6 +216,7 @@ PokemonNames::
|
|||
db "IGGLYBUFF@"
|
||||
db "TOGEPI@@@@"
|
||||
db "TOGETIC@@@"
|
||||
db "TOGEKISS@@"
|
||||
db "NATU@@@@@@"
|
||||
db "XATU@@@@@@"
|
||||
db "MOIBELLE@@"
|
||||
|
|
|
|||
|
|
@ -457,6 +457,8 @@ INCBIN "gfx/pokemon/togepi/front.gbcpal", middle_colors
|
|||
INCLUDE "gfx/pokemon/togepi/shiny.pal"
|
||||
INCBIN "gfx/pokemon/togetic/front.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/togetic/shiny.pal"
|
||||
INCBIN "gfx/pokemon/togekiss/front.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/togekiss/shiny.pal"
|
||||
INCBIN "gfx/pokemon/natu/front.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/natu/shiny.pal"
|
||||
INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors
|
||||
|
|
|
|||
|
|
@ -437,6 +437,8 @@ PokemonPicPointers::
|
|||
dba TogepiBackpic
|
||||
dba TogeticFrontpic
|
||||
dba TogeticBackpic
|
||||
dba TogekissFrontpic
|
||||
dba TogekissBackpic
|
||||
dba NatuFrontpic
|
||||
dba NatuBackpic
|
||||
dba XatuFrontpic
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue