diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f3e45ad..e82352d 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -124,6 +124,7 @@ const RIBBITO const CROAKOZUNA const FARFETCH_D ; 53 + const LUXWAN const DODUO ; 54 const DODRIO ; 55 const SEEL ; 56 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 47c2959..c7b7f3d 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -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" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index c869f76..2182935 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 6657749..681140d 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -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" diff --git a/data/pokemon/dex_entries/luxwan.asm b/data/pokemon/dex_entries/luxwan.asm new file mode 100644 index 0000000..b7ca0aa --- /dev/null +++ b/data/pokemon/dex_entries/luxwan.asm @@ -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.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 60d2315..10eb5c4 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -106,6 +106,7 @@ PokedexDataPointerTable: dba RibbitoPokedexEntry dba CroakozunaPokedexEntry dba FarfetchDPokedexEntry + dba LuxwanPokedexEntry dba DoduoPokedexEntry dba DodrioPokedexEntry dba SeelPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 89a9e68..a73c94d 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -173,6 +173,7 @@ AlphabeticalPokedexOrder: dw LICKITUNG dw LUANBO dw LUGIA + dw LUXWAN dw LURREEL dw MACHAMP dw MACHOKE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index ff77166..c90631a 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -203,6 +203,7 @@ NewPokedexOrder: dw MR__MIME dw SMEARGLE dw FARFETCH_D + dw LUXWAN dw NATU dw QATU dw XATU diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 307773c..69394b4 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -106,6 +106,7 @@ EggMovePointers1: dw RibbitoEggMoves dw NoEggMoves1 ; Croakozuna dw FarfetchDEggMoves + dw NoEggMoves1 ; Luxwan dw DoduoEggMoves dw NoEggMoves1 dw SeelEggMoves diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index e472a4f..5083e94 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -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 diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 492b516..0c2cbbd 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -106,6 +106,7 @@ FirstEvoStages:: dw RIBBITO dw RIBBITO dw FARFETCH_D + dw FARFETCH_D dw DODUO dw DODUO dw SEEL diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 0502f62..ee64fd8 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -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 diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 5276ab9..43fde7e 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -359,4 +359,5 @@ Pokered_MonIndices: db LURREEL db MANTYKE db WEIRDUCK + db LUXWAN assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index bcd5c15..21951df 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 64aa051..b109ab7 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -109,6 +109,7 @@ PokemonNames:: db "RIBBITO@@@" db "CROAKOZUNA" db "FARFETCH'D" + db "LUXWAN@@@@" db "DODUO@@@@@" db "DODRIO@@@@" db "SEEL@@@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 5320f3c..6901a0b 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -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 diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 79b0147..b421234 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -223,6 +223,8 @@ PokemonPicPointers:: dba CroakozunaBackpic dba FarfetchDFrontpic dba FarfetchDBackpic + dba LuxwanFrontpic + dba LuxwanBackpic dba DoduoFrontpic dba DoduoBackpic dba DodrioFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 17f9b12..e18e355 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -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" diff --git a/gfx/footprints/luxwan.png b/gfx/footprints/luxwan.png new file mode 100644 index 0000000..cef7002 Binary files /dev/null and b/gfx/footprints/luxwan.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 27a453e..b77b7b4 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -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" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 1177214..094c84c 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -105,6 +105,7 @@ AnimationPointers: dw RibbitoAnimation dw CroakozunaAnimation dw FarfetchDAnimation + dw LuxwanAnimation dw DoduoAnimation dw DodrioAnimation dw SeelAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 0ecc815..c382149 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -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" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index b679261..15d7510 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -105,6 +105,7 @@ BitmasksPointers: dw RibbitoBitmasks dw CroakozunaBitmasks dw FarfetchDBitmasks + dw LuxwanBitmasks dw DoduoBitmasks dw DodrioBitmasks dw SeelBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index b4b74f5..3b9263a 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -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" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index fd0d9f7..581ec52 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -105,6 +105,7 @@ FramesPointers: dba RibbitoFrames dba CroakozunaFrames dba FarfetchDFrames + dba LuxwanFrames dba DoduoFrames dba DodrioFrames dba SeelFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 48a8c42..72a015a 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -105,6 +105,7 @@ AnimationIdlePointers: dw RibbitoAnimationIdle dw CroakozunaAnimationIdle dw FarfetchDAnimationIdle + dw LuxwanAnimationIdle dw DoduoAnimationIdle dw DodrioAnimationIdle dw SeelAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 3c919e0..0de9e49 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -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" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 66187e0..fdd6f6d 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -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" diff --git a/gfx/pokemon/luxwan/anim.asm b/gfx/pokemon/luxwan/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/luxwan/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/luxwan/anim_idle.asm b/gfx/pokemon/luxwan/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/luxwan/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/luxwan/back.png b/gfx/pokemon/luxwan/back.png new file mode 100644 index 0000000..3f84de5 Binary files /dev/null and b/gfx/pokemon/luxwan/back.png differ diff --git a/gfx/pokemon/luxwan/front.png b/gfx/pokemon/luxwan/front.png new file mode 100644 index 0000000..186e68a Binary files /dev/null and b/gfx/pokemon/luxwan/front.png differ diff --git a/gfx/pokemon/luxwan/shiny.pal b/gfx/pokemon/luxwan/shiny.pal new file mode 100644 index 0000000..aa34752 --- /dev/null +++ b/gfx/pokemon/luxwan/shiny.pal @@ -0,0 +1,4 @@ + + RGB 31, 17, 31 + RGB 31, 21, 00 + diff --git a/main.asm b/main.asm index d6e2d6a..68763fe 100644 --- a/main.asm +++ b/main.asm @@ -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" diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index a366265..600ed22 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -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