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

Togekiss!

Browse source 
No sprite yet - someone will need to catch that
This commit is contained in:
Llinos Evans 2024-07-02 11:52:43 +01:00
parent c6b2bf0885
commit 5b831b6e81
33 changed files with 76 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -232,6 +232,7 @@ DEF JOHTO_POKEMON EQU const_value
const IGGLYBUFF ; ae const IGGLYBUFF ; ae
const TOGEPI ; af const TOGEPI ; af
const TOGETIC ; b0 const TOGETIC ; b0
const TOGEKISS
const NATU ; b1 const NATU ; b1
const XATU ; b2 const XATU ; b2
const MOIBELLE const MOIBELLE

1
data/pokemon/base_stats.asm
View file

@ -239,6 +239,7 @@ INCLUDE "data/pokemon/base_stats/cleffa.asm"
INCLUDE "data/pokemon/base_stats/igglybuff.asm" INCLUDE "data/pokemon/base_stats/igglybuff.asm"
INCLUDE "data/pokemon/base_stats/togepi.asm" INCLUDE "data/pokemon/base_stats/togepi.asm"
INCLUDE "data/pokemon/base_stats/togetic.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/natu.asm"
INCLUDE "data/pokemon/base_stats/xatu.asm" INCLUDE "data/pokemon/base_stats/xatu.asm"
INCLUDE "data/pokemon/base_stats/moibelle.asm" INCLUDE "data/pokemon/base_stats/moibelle.asm"

21
data/pokemon/base_stats/togekiss.asm Normal file
View 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

1
data/pokemon/cries.asm
View file

@ -218,6 +218,7 @@ PokemonCries::
mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF
mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI
mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC 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, -103, 256 ; NATU
mon_cry CRY_NATU, -167, 360 ; XATU mon_cry CRY_NATU, -167, 360 ; XATU
mon_cry CRY_NIDORAN_M, 0, 0 ; MOIBELLE (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; MOIBELLE (incomplete)

1
data/pokemon/dex_entries.asm
View file

@ -220,6 +220,7 @@ CleffaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cleffa.asm"
IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm" IgglybuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/igglybuff.asm"
TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm" TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm"
TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.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" NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm"
XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm" XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm"
MoibellePokedexEntry:: INCLUDE "data/pokemon/dex_entries/moibelle.asm" MoibellePokedexEntry:: INCLUDE "data/pokemon/dex_entries/moibelle.asm"

10
data/pokemon/dex_entries/togekiss.asm Normal file
View 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.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -213,6 +213,7 @@ PokedexDataPointerTable:
dba IgglybuffPokedexEntry dba IgglybuffPokedexEntry
dba TogepiPokedexEntry dba TogepiPokedexEntry
dba TogeticPokedexEntry dba TogeticPokedexEntry
dba TogekissPokedexEntry
dba NatuPokedexEntry dba NatuPokedexEntry
dba XatuPokedexEntry dba XatuPokedexEntry
dba MoibellePokedexEntry dba MoibellePokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -303,6 +303,7 @@ AlphabeticalPokedexOrder:
dw TENTACRUEL dw TENTACRUEL
dw TOGEPI dw TOGEPI
dw TOGETIC dw TOGETIC
dw TOGEKISS
dw TONQUITO dw TONQUITO
dw TOTARTLE dw TOTARTLE
dw TOTODILE dw TOTODILE

1
data/pokemon/dex_order_new.asm
View file

@ -66,6 +66,7 @@ NewPokedexOrder:
dw WIGGLYTUFF dw WIGGLYTUFF
dw TOGEPI dw TOGEPI
dw TOGETIC dw TOGETIC
dw TOGEKISS
dw SANDSHREW dw SANDSHREW
dw SANDSLASH dw SANDSLASH
dw EKANS dw EKANS

1
data/pokemon/egg_moves_johto.asm
View file

@ -34,6 +34,7 @@ EggMovePointers2::
dw IgglybuffEggMoves dw IgglybuffEggMoves
dw TogepiEggMoves dw TogepiEggMoves
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2
dw NatuEggMoves dw NatuEggMoves
dw NoEggMoves2 dw NoEggMoves2
dw MoibelleEggMoves dw MoibelleEggMoves

15
data/pokemon/evos_attacks_johto.asm
View file

@ -34,6 +34,7 @@ EvosAttacksPointers2::
dw IgglybuffEvosAttacks dw IgglybuffEvosAttacks
dw TogepiEvosAttacks dw TogepiEvosAttacks
dw TogeticEvosAttacks dw TogeticEvosAttacks
dw TogekissEvosAttacks
dw NatuEvosAttacks dw NatuEvosAttacks
dw XatuEvosAttacks dw XatuEvosAttacks
dw MoibelleEvoAttacks dw MoibelleEvoAttacks
@ -604,7 +605,8 @@ TogepiEvosAttacks:
db 0 ; no more level-up moves db 0 ; no more level-up moves
TogeticEvosAttacks: TogeticEvosAttacks:
db 0 ; no more evolutions dbbw EVOLVE_ITEM, SHINY_STONE, TOGEKISS
db 0; no more evolutions
dbw 1, GROWL dbw 1, GROWL
dbw 1, CHARM dbw 1, CHARM
dbw 7, METRONOME dbw 7, METRONOME
@ -613,6 +615,14 @@ TogeticEvosAttacks:
dbw 31, SAFEGUARD dbw 31, SAFEGUARD
dbw 38, DOUBLE_EDGE dbw 38, DOUBLE_EDGE
db 0 ; no more level-up moves 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: NatuEvosAttacks:
dbbw EVOLVE_LEVEL, 25, XATU dbbw EVOLVE_LEVEL, 25, XATU
@ -1958,7 +1968,8 @@ RuddernautEvosAttacks:
db 0 ; no more level-up moves db 0 ; no more level-up moves
XylodonEvosAttacks: XylodonEvosAttacks:
db EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions dbbw EVOLVE_LEVEL, 40, XYLOFIN ; no more evolutions
db 0
dbw 1, HEADBUTT dbw 1, HEADBUTT
dbw 1, WITHDRAW dbw 1, WITHDRAW
dbw 7, ROCK_THROW dbw 7, ROCK_THROW

1
data/pokemon/first_stages.asm
View file

@ -213,6 +213,7 @@ FirstEvoStages::
dw IGGLYBUFF dw IGGLYBUFF
dw TOGEPI dw TOGEPI
dw TOGEPI ;b0 dw TOGEPI ;b0
dw TOGEPI
dw NATU dw NATU
dw NATU dw NATU
dw MOIBELLE dw MOIBELLE

1
data/pokemon/gen1_order.asm
View file

@ -226,6 +226,7 @@ Pokered_MonIndices:
db IGGLYBUFF db IGGLYBUFF
db TOGEPI db TOGEPI
db TOGETIC db TOGETIC
db TOGEKISS
db NATU db NATU
db XATU db XATU
db MOIBELLE db MOIBELLE

1
data/pokemon/menu_icons.asm
View file

@ -214,6 +214,7 @@ MonMenuIcons:
db ICON_JIGGLYPUFF ; IGGLYBUFF db ICON_JIGGLYPUFF ; IGGLYBUFF
db ICON_CLEFAIRY ; TOGEPI db ICON_CLEFAIRY ; TOGEPI
db ICON_BIRD ; TOGETIC db ICON_BIRD ; TOGETIC
db ICON_BIRD ; TOGEKISS
db ICON_BIRD ; NATU db ICON_BIRD ; NATU
db ICON_BIRD ; XATU db ICON_BIRD ; XATU
db ICON_FOX ; MOIBELLE db ICON_FOX ; MOIBELLE

1
data/pokemon/names.asm
View file

@ -216,6 +216,7 @@ PokemonNames::
db "IGGLYBUFF@" db "IGGLYBUFF@"
db "TOGEPI@@@@" db "TOGEPI@@@@"
db "TOGETIC@@@" db "TOGETIC@@@"
db "TOGEKISS@@"
db "NATU@@@@@@" db "NATU@@@@@@"
db "XATU@@@@@@" db "XATU@@@@@@"
db "MOIBELLE@@" db "MOIBELLE@@"

2
data/pokemon/palettes.asm
View file

@ -457,6 +457,8 @@ INCBIN "gfx/pokemon/togepi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/togepi/shiny.pal" INCLUDE "gfx/pokemon/togepi/shiny.pal"
INCBIN "gfx/pokemon/togetic/front.gbcpal", middle_colors INCBIN "gfx/pokemon/togetic/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/togetic/shiny.pal" 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 INCBIN "gfx/pokemon/natu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/natu/shiny.pal" INCLUDE "gfx/pokemon/natu/shiny.pal"
INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -437,6 +437,8 @@ PokemonPicPointers::
dba TogepiBackpic dba TogepiBackpic
dba TogeticFrontpic dba TogeticFrontpic
dba TogeticBackpic dba TogeticBackpic
dba TogekissFrontpic
dba TogekissBackpic
dba NatuFrontpic dba NatuFrontpic
dba NatuBackpic dba NatuBackpic
dba XatuFrontpic dba XatuFrontpic

1
gfx/footprints.asm
View file

@ -213,6 +213,7 @@ INCBIN "gfx/footprints/cleffa.1bpp"
INCBIN "gfx/footprints/igglybuff.1bpp" INCBIN "gfx/footprints/igglybuff.1bpp"
INCBIN "gfx/footprints/togepi.1bpp" INCBIN "gfx/footprints/togepi.1bpp"
INCBIN "gfx/footprints/togetic.1bpp" INCBIN "gfx/footprints/togetic.1bpp"
INCBIN "gfx/footprints/togekiss.1bpp"
INCBIN "gfx/footprints/natu.1bpp" INCBIN "gfx/footprints/natu.1bpp"
INCBIN "gfx/footprints/xatu.1bpp" INCBIN "gfx/footprints/xatu.1bpp"
INCBIN "gfx/footprints/moibelle.1bpp" INCBIN "gfx/footprints/moibelle.1bpp"

BIN
gfx/footprints/togekiss.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 88 B

4
gfx/pics.asm
View file

@ -899,4 +899,6 @@ IronBundleBackpic: INCBIN "gfx/pokemon/iron_bundle/back.2bpp.lz"
IronThornsFrontpic: INCBIN "gfx/pokemon/iron_thorns/front.animated.2bpp.lz" IronThornsFrontpic: INCBIN "gfx/pokemon/iron_thorns/front.animated.2bpp.lz"
IronThornsBackpic: INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz" IronThornsBackpic: INCBIN "gfx/pokemon/iron_thorns/back.2bpp.lz"
OrfryFrontpic: INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz" OrfryFrontpic: INCBIN "gfx/pokemon/orfry/front.animated.2bpp.lz"
OrfryBackpic: INCBIN "gfx/pokemon/orfry/back.2bpp.lz" OrfryBackpic: INCBIN "gfx/pokemon/orfry/back.2bpp.lz"
TogekissFrontpic: INCBIN "gfx/pokemon/togekiss/front.animated.2bpp.lz"
TogekissBackpic: INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -212,6 +212,7 @@ AnimationPointers:
dw IgglybuffAnimation dw IgglybuffAnimation
dw TogepiAnimation dw TogepiAnimation
dw TogeticAnimation dw TogeticAnimation
dw TogekissAnimation
dw NatuAnimation dw NatuAnimation
dw XatuAnimation dw XatuAnimation
dw MoibelleAnimation dw MoibelleAnimation

1
gfx/pokemon/anims.asm
View file

@ -210,6 +210,7 @@ CleffaAnimation: INCLUDE "gfx/pokemon/cleffa/anim.asm"
IgglybuffAnimation: INCLUDE "gfx/pokemon/igglybuff/anim.asm" IgglybuffAnimation: INCLUDE "gfx/pokemon/igglybuff/anim.asm"
TogepiAnimation: INCLUDE "gfx/pokemon/togepi/anim.asm" TogepiAnimation: INCLUDE "gfx/pokemon/togepi/anim.asm"
TogeticAnimation: INCLUDE "gfx/pokemon/togetic/anim.asm" TogeticAnimation: INCLUDE "gfx/pokemon/togetic/anim.asm"
TogekissAnimation: INCLUDE "gfx/pokemon/togekiss/anim.asm"
NatuAnimation: INCLUDE "gfx/pokemon/natu/anim.asm" NatuAnimation: INCLUDE "gfx/pokemon/natu/anim.asm"
XatuAnimation: INCLUDE "gfx/pokemon/xatu/anim.asm" XatuAnimation: INCLUDE "gfx/pokemon/xatu/anim.asm"
MoibelleAnimation: INCLUDE "gfx/pokemon/moibelle/anim.asm" MoibelleAnimation: INCLUDE "gfx/pokemon/moibelle/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -212,6 +212,7 @@ BitmasksPointers:
dw IgglybuffBitmasks dw IgglybuffBitmasks
dw TogepiBitmasks dw TogepiBitmasks
dw TogeticBitmasks dw TogeticBitmasks
dw TogekissBitmasks
dw NatuBitmasks dw NatuBitmasks
dw XatuBitmasks dw XatuBitmasks
dw MoibelleBitmasks dw MoibelleBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -210,6 +210,7 @@ CleffaBitmasks: INCLUDE "gfx/pokemon/cleffa/bitmask.asm"
IgglybuffBitmasks: INCLUDE "gfx/pokemon/igglybuff/bitmask.asm" IgglybuffBitmasks: INCLUDE "gfx/pokemon/igglybuff/bitmask.asm"
TogepiBitmasks: INCLUDE "gfx/pokemon/togepi/bitmask.asm" TogepiBitmasks: INCLUDE "gfx/pokemon/togepi/bitmask.asm"
TogeticBitmasks: INCLUDE "gfx/pokemon/togetic/bitmask.asm" TogeticBitmasks: INCLUDE "gfx/pokemon/togetic/bitmask.asm"
TogekissBitmasks: INCLUDE "gfx/pokemon/togekiss/bitmask.asm"
NatuBitmasks: INCLUDE "gfx/pokemon/natu/bitmask.asm" NatuBitmasks: INCLUDE "gfx/pokemon/natu/bitmask.asm"
XatuBitmasks: INCLUDE "gfx/pokemon/xatu/bitmask.asm" XatuBitmasks: INCLUDE "gfx/pokemon/xatu/bitmask.asm"
MoibelleBitmasks: INCLUDE "gfx/pokemon/moibelle/bitmask.asm" MoibelleBitmasks: INCLUDE "gfx/pokemon/moibelle/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -212,6 +212,7 @@ FramesPointers:
dba IgglybuffFrames dba IgglybuffFrames
dba TogepiFrames dba TogepiFrames
dba TogeticFrames dba TogeticFrames
dba TogekissFrames
dba NatuFrames dba NatuFrames
dba XatuFrames dba XatuFrames
dba MoibelleFrames dba MoibelleFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -212,6 +212,7 @@ AnimationIdlePointers:
dw IgglybuffAnimationIdle dw IgglybuffAnimationIdle
dw TogepiAnimationIdle dw TogepiAnimationIdle
dw TogeticAnimationIdle dw TogeticAnimationIdle
dw TogekissAnimationIdle
dw NatuAnimationIdle dw NatuAnimationIdle
dw XatuAnimationIdle dw XatuAnimationIdle
dw MoibelleAnimationIdle dw MoibelleAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -210,6 +210,7 @@ CleffaAnimationIdle: INCLUDE "gfx/pokemon/cleffa/anim_idle.asm"
IgglybuffAnimationIdle: INCLUDE "gfx/pokemon/igglybuff/anim_idle.asm" IgglybuffAnimationIdle: INCLUDE "gfx/pokemon/igglybuff/anim_idle.asm"
TogepiAnimationIdle: INCLUDE "gfx/pokemon/togepi/anim_idle.asm" TogepiAnimationIdle: INCLUDE "gfx/pokemon/togepi/anim_idle.asm"
TogeticAnimationIdle: INCLUDE "gfx/pokemon/togetic/anim_idle.asm" TogeticAnimationIdle: INCLUDE "gfx/pokemon/togetic/anim_idle.asm"
TogekissAnimationIdle: INCLUDE "gfx/pokemon/togekiss/anim_idle.asm"
NatuAnimationIdle: INCLUDE "gfx/pokemon/natu/anim_idle.asm" NatuAnimationIdle: INCLUDE "gfx/pokemon/natu/anim_idle.asm"
XatuAnimationIdle: INCLUDE "gfx/pokemon/xatu/anim_idle.asm" XatuAnimationIdle: INCLUDE "gfx/pokemon/xatu/anim_idle.asm"
MoibelleAnimationIdle: INCLUDE "gfx/pokemon/moibelle/anim_idle.asm" MoibelleAnimationIdle: INCLUDE "gfx/pokemon/moibelle/anim_idle.asm"

1
gfx/pokemon/johto_frames.asm
View file

@ -33,6 +33,7 @@ CleffaFrames: INCLUDE "gfx/pokemon/cleffa/frames.asm"
IgglybuffFrames: INCLUDE "gfx/pokemon/igglybuff/frames.asm" IgglybuffFrames: INCLUDE "gfx/pokemon/igglybuff/frames.asm"
TogepiFrames: INCLUDE "gfx/pokemon/togepi/frames.asm" TogepiFrames: INCLUDE "gfx/pokemon/togepi/frames.asm"
TogeticFrames: INCLUDE "gfx/pokemon/togetic/frames.asm" TogeticFrames: INCLUDE "gfx/pokemon/togetic/frames.asm"
TogekissFrames: INCLUDE "gfx/pokemon/togekiss/frames.asm"
NatuFrames: INCLUDE "gfx/pokemon/natu/frames.asm" NatuFrames: INCLUDE "gfx/pokemon/natu/frames.asm"
XatuFrames: INCLUDE "gfx/pokemon/xatu/frames.asm" XatuFrames: INCLUDE "gfx/pokemon/xatu/frames.asm"
MoibelleFrames: INCLUDE "gfx/pokemon/moibelle/frames.asm" MoibelleFrames: INCLUDE "gfx/pokemon/moibelle/frames.asm"

1
gfx/pokemon/togekiss/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/togekiss/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/togekiss/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/togekiss/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/togekiss/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25