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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -124,6 +124,7 @@
const RIBBITO
const CROAKOZUNA
const FARFETCH_D ; 53
const LUXWAN
const DODUO ; 54
const DODRIO ; 55
const SEEL ; 56

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

1
gfx/footprints.asm
View file

@ -106,6 +106,7 @@ INCBIN "gfx/footprints/jabetta.1bpp"
INCBIN "gfx/footprints/ribbito.1bpp"
INCBIN "gfx/footprints/croakozuna.1bpp"
INCBIN "gfx/footprints/farfetch_d.1bpp"
INCBIN "gfx/footprints/luxwan.1bpp"
INCBIN "gfx/footprints/doduo.1bpp"
INCBIN "gfx/footprints/dodrio.1bpp"
INCBIN "gfx/footprints/seel.1bpp"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 168 B

2
gfx/pics.asm
View file

@ -942,3 +942,5 @@ MantykeFrontpic: INCBIN "gfx/pokemon/mantyke/front.animated.2bpp.lz"
MantykeBackpic: INCBIN "gfx/pokemon/mantyke/back.2bpp.lz"
WeirduckFrontpic: INCBIN "gfx/pokemon/weirduck/front.animated.2bpp.lz"
WeirduckBackpic: INCBIN "gfx/pokemon/weirduck/back.2bpp.lz"
LuxwanFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz"
LuxwanBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -105,6 +105,7 @@ AnimationPointers:
dw RibbitoAnimation
dw CroakozunaAnimation
dw FarfetchDAnimation
dw LuxwanAnimation
dw DoduoAnimation
dw DodrioAnimation
dw SeelAnimation

1
gfx/pokemon/anims.asm
View file

@ -103,6 +103,7 @@ JabettaAnimation: INCLUDE "gfx/pokemon/jabetta/anim.asm"
RibbitoAnimation: INCLUDE "gfx/pokemon/ribbito/anim.asm"
CroakozunaAnimation: INCLUDE "gfx/pokemon/croakozuna/anim.asm"
FarfetchDAnimation: INCLUDE "gfx/pokemon/farfetch_d/anim.asm"
LuxwanAnimation: INCLUDE "gfx/pokemon/luxwan/anim.asm"
DoduoAnimation: INCLUDE "gfx/pokemon/doduo/anim.asm"
DodrioAnimation: INCLUDE "gfx/pokemon/dodrio/anim.asm"
SeelAnimation: INCLUDE "gfx/pokemon/seel/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -105,6 +105,7 @@ BitmasksPointers:
dw RibbitoBitmasks
dw CroakozunaBitmasks
dw FarfetchDBitmasks
dw LuxwanBitmasks
dw DoduoBitmasks
dw DodrioBitmasks
dw SeelBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -103,6 +103,7 @@ JabettaBitmasks: INCLUDE "gfx/pokemon/jabetta/bitmask.asm"
RibbitoBitmasks: INCLUDE "gfx/pokemon/ribbito/bitmask.asm"
CroakozunaBitmasks: INCLUDE "gfx/pokemon/croakozuna/bitmask.asm"
FarfetchDBitmasks: INCLUDE "gfx/pokemon/farfetch_d/bitmask.asm"
LuxwanBitmasks: INCLUDE "gfx/pokemon/luxwan/bitmask.asm"
DoduoBitmasks: INCLUDE "gfx/pokemon/doduo/bitmask.asm"
DodrioBitmasks: INCLUDE "gfx/pokemon/dodrio/bitmask.asm"
SeelBitmasks: INCLUDE "gfx/pokemon/seel/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -105,6 +105,7 @@ FramesPointers:
dba RibbitoFrames
dba CroakozunaFrames
dba FarfetchDFrames
dba LuxwanFrames
dba DoduoFrames
dba DodrioFrames
dba SeelFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -105,6 +105,7 @@ AnimationIdlePointers:
dw RibbitoAnimationIdle
dw CroakozunaAnimationIdle
dw FarfetchDAnimationIdle
dw LuxwanAnimationIdle
dw DoduoAnimationIdle
dw DodrioAnimationIdle
dw SeelAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -103,6 +103,7 @@ JabettaAnimationIdle: INCLUDE "gfx/pokemon/jabetta/anim_idle.asm"
RibbitoAnimationIdle: INCLUDE "gfx/pokemon/ribbito/anim_idle.asm"
CroakozunaAnimationIdle: INCLUDE "gfx/pokemon/croakozuna/anim_idle.asm"
FarfetchDAnimationIdle: INCLUDE "gfx/pokemon/farfetch_d/anim_idle.asm"
LuxwanAnimationIdle: INCLUDE "gfx/pokemon/luxwan/anim_idle.asm"
DoduoAnimationIdle: INCLUDE "gfx/pokemon/doduo/anim_idle.asm"
DodrioAnimationIdle: INCLUDE "gfx/pokemon/dodrio/anim_idle.asm"
SeelAnimationIdle: INCLUDE "gfx/pokemon/seel/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -105,6 +105,7 @@ JabettaFrames: INCLUDE "gfx/pokemon/jabetta/frames.asm"
RibbitoFrames: INCLUDE "gfx/pokemon/ribbito/frames.asm"
CroakozunaFrames: INCLUDE "gfx/pokemon/croakozuna/frames.asm"
FarfetchDFrames: INCLUDE "gfx/pokemon/farfetch_d/frames.asm"
LuxwanFrames: INCLUDE "gfx/pokemon/luxwan/frames.asm"
DoduoFrames: INCLUDE "gfx/pokemon/doduo/frames.asm"
DodrioFrames: INCLUDE "gfx/pokemon/dodrio/frames.asm"
SeelFrames: INCLUDE "gfx/pokemon/seel/frames.asm"

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 487 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 706 B

4
gfx/pokemon/luxwan/shiny.pal Normal file
View file

@ -0,0 +1,4 @@
RGB 31, 17, 31
RGB 31, 21, 00

4
main.asm
View file

@ -429,12 +429,12 @@ INCLUDE "gfx/pokemon/unown_anim_pointers.asm"
INCLUDE "gfx/pokemon/unown_anims.asm"
INCLUDE "gfx/pokemon/unown_idle_pointers.asm"
INCLUDE "gfx/pokemon/unown_idles.asm"
INCLUDE "gfx/pokemon/bitmask_pointers.asm"
INCLUDE "gfx/pokemon/bitmasks.asm"
SECTION "Pic Animations 2", ROMX
INCLUDE "gfx/pokemon/bitmask_pointers.asm"
INCLUDE "gfx/pokemon/bitmasks.asm"
INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
INCLUDE "gfx/pokemon/unown_bitmasks.asm"
INCLUDE "gfx/pokemon/frame_pointers.asm"

4
maps/DebugRoom.asm
View file

@ -8,12 +8,12 @@ DebugRoom_MapScripts:
DebugPokemon1Script:
opentext
getmonname STRING_BUFFER_3, WYNAUT
getmonname STRING_BUFFER_3, LUXWAN
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke QWILFISH, 24, POISON_STONE
givepoke LUXWAN, 24, POISON_STONE
closetext
end