From 49729150767c171891310333b978d3918165b63a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 6 Jul 2024 18:16:45 +0100 Subject: [PATCH] Luxwan Now the random farfetch'd are worth catching! Also I fucked up the channels on the sprite can someone get that --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/luxwan.asm | 10 ++++++++++ data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_kanto.asm | 1 + data/pokemon/evos_attacks_kanto.asm | 15 +++++++++++++++ data/pokemon/first_stages.asm | 1 + data/pokemon/gen1_base_special.asm | 1 + data/pokemon/gen1_order.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints.asm | 1 + gfx/footprints/luxwan.png | Bin 0 -> 168 bytes gfx/pics.asm | 2 ++ gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/kanto_frames.asm | 1 + gfx/pokemon/luxwan/anim.asm | 1 + gfx/pokemon/luxwan/anim_idle.asm | 1 + gfx/pokemon/luxwan/back.png | Bin 0 -> 487 bytes gfx/pokemon/luxwan/front.png | Bin 0 -> 706 bytes gfx/pokemon/luxwan/shiny.pal | 4 ++++ main.asm | 4 ++-- maps/DebugRoom.asm | 4 ++-- 35 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 data/pokemon/dex_entries/luxwan.asm create mode 100644 gfx/footprints/luxwan.png create mode 100644 gfx/pokemon/luxwan/anim.asm create mode 100644 gfx/pokemon/luxwan/anim_idle.asm create mode 100644 gfx/pokemon/luxwan/back.png create mode 100644 gfx/pokemon/luxwan/front.png create mode 100644 gfx/pokemon/luxwan/shiny.pal 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 0000000000000000000000000000000000000000..cef700257b35f8207667cb9c103ff85399d00d41 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFPx#1ZP1_K>z@;j|==^1poj53{Xr|MgRZ*twN;$004xg&f45c=l}o!32;bRa{vGi z!vFvd!vV){sAK>D0c1%;K~y-)os(Un#1IUHBQ{WMK-mDz{`YqCL#w7w*UOlEl5;`| z|6ehG1YOCFt`CstLZXipiDoE!I26c$1z}IARQPbgpIWu?d0u&wk8(UwFI;Q`1ycj) zCFdQSO`9p_3vl%W1~$W3+BXne%6D5>^~Ya%yT}26N_@*t!1n69`?LVG-C-%seAkN< zAo*(rK(Xl!=hnK~a0Yy@D80MnJq2q-<1|VmC-gYgJ<;p}6R&uS+;MQB_im*`#P_@H zGlVeyh{!WP7($#|@%41g&pfy4Ye~6*rug}S_~?yRrr`x3EyY&AWA~(_e!!9>Yk&^h!L`Ul9=CGic>DsZ=omCrPXmluxD0Ttj{dA? zqEmp_8m9P@<*%unbP|!ca1=*EtQ_JQA-bxZvJt_~0jou%Rr$@;Ql&A7{OV-I^DR9u dWgN)>@CU-9FY$OH;}8G<002ovPDHLkV1geU)}#Oc literal 0 HcmV?d00001 diff --git a/gfx/pokemon/luxwan/front.png b/gfx/pokemon/luxwan/front.png new file mode 100644 index 0000000000000000000000000000000000000000..186e68aa6e038e18e6b82b47847cf8ff0fd747c7 GIT binary patch literal 706 zcmV;z0zLhSP)Px#1ZP1_K>z@;j|==^1poj53{Xr|MgRZ*0001lrOvHFrRJ+?g8%>k32;bRa{vGi z!vFvd!vV){sAK>D0zXMaK~y-)ZBzl;>mUdddjYT)5PE@G?|-+KVAp@!tNXUKh5$jN z+{>=-(~_b^LZ6^b32NvQ_jD;D#qEjPLRGX{djh2k99Ip03W|WGM1(yA74E^SJ%iS( zaXrN}NyPT2m?mx}YWDixAGA&$4PHMgI^)=!G=Sk|w!Ljytq>>MOcYpypx97RD(rpW zcg`_qa~7)n178n=>IK$6G0Q6tg6)+ByTH|@yawEl@LtwQrBH$( z15B^1>(DzP5<9)Ni&*cRDy>=t=w~cqf^fE#dSnZE#D2ycJP>aSqy)yR2-%Lgh^}w2 zq7zzlc#Sx`XUM+5s+}hf8o?7?Sc{Lcq*lBh7kI|#Sh2SYgb2t>8bY=Jv+mk2u+0E(7RJs5I5K4%Vu&XZ!1l^^YDifhS%0!Hpe^B>T5Og0ohZ?(2B zuTtzKd3_O>h4D|X+td+9YGp5fjjBEGZksdwzY&%mr*eqxF#18cH%Zy&_3*{DHM?x? oV~+B?Fs^ak^ce)E?_5jy2gR~ZFX!X{<^TWy07*qoM6N<$f>S;?!2kdN literal 0 HcmV?d00001 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