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

Luxwan

Browse source 
Now the random farfetch'd are worth catching!

Also I fucked up the channels on the sprite can someone get that
This commit is contained in:
Llinos Evans 2024-07-06 18:16:45 +01:00
parent d191b9c60b
commit 4972915076
35 changed files with 63 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/pokemon/base_stats.asm
View file

@ -132,6 +132,7 @@ INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/farfetch_d.asm"
INCLUDE "data/pokemon/base_stats/luxwan.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"

1
data/pokemon/cries.asm
View file

@ -111,6 +111,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; RIBBITO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CROAKOZUNA (incomplete)
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D
mon_cry CRY_SUNFLORA, 13, 256 ; LUXWAN (incomplete - just taken from remoraid for now)
mon_cry CRY_DIGLETT, 187, 129 ; DODUO
mon_cry CRY_DIGLETT, 153, 160 ; DODRIO
mon_cry CRY_SEEL, 136, 320 ; SEEL

1
data/pokemon/dex_entries.asm
View file

@ -109,6 +109,7 @@ JabettaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jabetta.asm"
RibbitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ribbito.asm"
CroakozunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croakozuna.asm"
FarfetchDPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farfetch_d.asm"
LuxwanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/luxwan.asm"
DoduoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/doduo.asm"
DodrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dodrio.asm"
SeelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seel.asm"

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

@ -0,0 +1,10 @@
db "MASQUERADE@" ; species name
dw 393, 595 ; height, weight
db "Rarely seen, but"
next "popular in France." ; Playing on the "madame" name - I'm also in Paris, so I'm larping.
next "Recent studies" ; This part is taken from the prototype entry.
page "show the object"
next "it holds is a"
next "spring onion.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -106,6 +106,7 @@ PokedexDataPointerTable:
dba RibbitoPokedexEntry
dba CroakozunaPokedexEntry
dba FarfetchDPokedexEntry
dba LuxwanPokedexEntry
dba DoduoPokedexEntry
dba DodrioPokedexEntry
dba SeelPokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -173,6 +173,7 @@ AlphabeticalPokedexOrder:
dw LICKITUNG
dw LUANBO
dw LUGIA
dw LUXWAN
dw LURREEL
dw MACHAMP
dw MACHOKE

1
data/pokemon/dex_order_new.asm
View file

@ -203,6 +203,7 @@ NewPokedexOrder:
dw MR__MIME
dw SMEARGLE
dw FARFETCH_D
dw LUXWAN
dw NATU
dw QATU
dw XATU

1
data/pokemon/egg_moves_kanto.asm
View file

@ -106,6 +106,7 @@ EggMovePointers1:
dw RibbitoEggMoves
dw NoEggMoves1 ; Croakozuna
dw FarfetchDEggMoves
dw NoEggMoves1 ; Luxwan
dw DoduoEggMoves
dw NoEggMoves1
dw SeelEggMoves

15
data/pokemon/evos_attacks_kanto.asm
View file

@ -106,6 +106,7 @@ EvosAttacksPointers1::
dw RibbitoEvosAttacks
dw CroakozunaEvosAttacks
dw FarfetchDEvosAttacks
dw LuxwanEvosAttacks
dw DoduoEvosAttacks
dw DodrioEvosAttacks
dw SeelEvosAttacks
@ -1604,6 +1605,7 @@ CroakozunaEvosAttacks:
db 0 ; no more level-up moves
FarfetchDEvosAttacks:
dbbw EVOLVE_HAPPINESS, TR_ANYTIME, LUXWAN ; Considering we're going off the final entries, this is unfortunately necessary.
db 0 ; no more evolutions
dbw 1, PECK
dbw 7, SAND_ATTACK
@ -1615,6 +1617,19 @@ FarfetchDEvosAttacks:
dbw 44, FALSE_SWIPE
db 0 ; no more level-up moves
LuxwanEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 7, SAND_ATTACK
dbw 13, LEER
dbw 19, FURY_ATTACK
dbw 25, SWORDS_DANCE
dbw 31, AGILITY
dbw 37, SLASH
dbw 44, FALSE_SWIPE
dbw 50, FURY_CUTTER
db 0 ; no more level-up moves
DoduoEvosAttacks:
dbbw EVOLVE_LEVEL, 31, DODRIO
db 0 ; no more evolutions

1
data/pokemon/first_stages.asm
View file

@ -106,6 +106,7 @@ FirstEvoStages::
dw RIBBITO
dw RIBBITO
dw FARFETCH_D
dw FARFETCH_D
dw DODUO
dw DODUO
dw SEEL

1
data/pokemon/gen1_base_special.asm
View file

@ -107,6 +107,7 @@ KantoMonSpecials:
db 55 ; RIBBITO
db 75 ; CROAKOZUNA
db 58 ; FARFETCH_D
db 63 ; LUXWAN
db 35 ; DODUO
db 60 ; DODRIO
db 70 ; SEEL

1
data/pokemon/gen1_order.asm
View file

@ -359,4 +359,5 @@ Pokered_MonIndices:
db LURREEL
db MANTYKE
db WEIRDUCK
db LUXWAN
assert_table_length NUM_POKEMON - 1

1
data/pokemon/menu_icons.asm
View file

@ -107,6 +107,7 @@ MonMenuIcons:
db ICON_POLIWAG ; RIBBITO
db ICON_POLIWAG ; CROAKOZUNA
db ICON_BIRD ; FARFETCH_D
db ICON_BIRD ; LUXWAN
db ICON_BIRD ; DODUO
db ICON_BIRD ; DODRIO
db ICON_LAPRAS ; SEEL

1
data/pokemon/names.asm
View file

@ -109,6 +109,7 @@ PokemonNames::
db "RIBBITO@@@"
db "CROAKOZUNA"
db "FARFETCH'D"
db "LUXWAN@@@@"
db "DODUO@@@@@"
db "DODRIO@@@@"
db "SEEL@@@@@@"

2
data/pokemon/palettes.asm
View file

@ -243,6 +243,8 @@ INCBIN "gfx/pokemon/croakozuna/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/croakozuna/shiny.pal"
INCBIN "gfx/pokemon/farfetch_d/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/farfetch_d/shiny.pal"
INCBIN "gfx/pokemon/luxwan/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/luxwan/shiny.pal"
INCBIN "gfx/pokemon/doduo/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/doduo/shiny.pal"
INCBIN "gfx/pokemon/dodrio/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -223,6 +223,8 @@ PokemonPicPointers::
dba CroakozunaBackpic
dba FarfetchDFrontpic
dba FarfetchDBackpic
dba LuxwanFrontpic
dba LuxwanBackpic
dba DoduoFrontpic
dba DoduoBackpic
dba DodrioFrontpic