From 429b390f3b897ee1a42bf50f025a2e32fae66e99 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sun, 28 Sep 2025 12:53:34 -0400 Subject: [PATCH] couple of sprites, shiny nidoqueen fix based on beta palettes --- gfx/pics.asm | 34 ++++++++++++++++---------------- gfx/pokemon/gorochu/front.png | Bin 315 -> 633 bytes gfx/pokemon/gorochu/shiny.pal | 4 ++-- gfx/pokemon/nidoqueen/shiny.pal | 4 ++-- gfx/pokemon/pendraken/front.png | Bin 315 -> 784 bytes maps/DebugRoom.asm | 14 ++++++------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/pics.asm b/gfx/pics.asm index 0ad3a43..ef1aadd 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -880,22 +880,6 @@ ToedscruelFrontpic: INCBIN "gfx/pokemon/toedscruel/front.animated.2bpp.lz" ToedscruelBackpic: INCBIN "gfx/pokemon/toedscruel/back.2bpp.lz" BlottleFrontpic: INCBIN "gfx/pokemon/blottle/front.animated.2bpp.lz" BlottleBackpic: INCBIN "gfx/pokemon/blottle/back.2bpp.lz" -PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz" -PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz" -KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz" -KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz" -BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz" -BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz" -MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz" -MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz" -MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" -MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" -GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" -GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" -BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz" -BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz" -GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz" -GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" SECTION "Pics 23", ROMX @@ -1128,7 +1112,23 @@ EvolottoBackpic: INCBIN "gfx/pokemon/evolotto/back.2bpp.lz" AlphalithFrontpic: INCBIN "gfx/pokemon/alphalith/front.animated.2bpp.lz" AlphalithBackpic: INCBIN "gfx/pokemon/alphalith/back.2bpp.lz" - +SECTION "Pics 29", ROMX +PendrakenFrontpic: INCBIN "gfx/pokemon/pendraken/front.animated.2bpp.lz" +PendrakenBackpic: INCBIN "gfx/pokemon/pendraken/back.2bpp.lz" +KoltaFrontpic: INCBIN "gfx/pokemon/kolta/front.animated.2bpp.lz" +KoltaBackpic: INCBIN "gfx/pokemon/kolta/back.2bpp.lz" +BalumbaFrontpic: INCBIN "gfx/pokemon/balumba/front.animated.2bpp.lz" +BalumbaBackpic: INCBIN "gfx/pokemon/balumba/back.2bpp.lz" +MagnetiteFrontpic: INCBIN "gfx/pokemon/magnetite/front.animated.2bpp.lz" +MagnetiteBackpic: INCBIN "gfx/pokemon/magnetite/back.2bpp.lz" +MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" +MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" +GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" +GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" +BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz" +BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz" +GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz" +GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" ; spillover KabutopsFossilPic: INCBIN "gfx/trainers/kabutops.2bpp.lz" AerodactylFossilPic: INCBIN "gfx/trainers/aerodactyl.2bpp.lz" \ No newline at end of file diff --git a/gfx/pokemon/gorochu/front.png b/gfx/pokemon/gorochu/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..0aea2faa530d2bb1bd516e1182cfd7098305b5b3 100644 GIT binary patch literal 633 zcmV-<0*3vGP)a0006gNkl{oZCU7qMilr36Sr||9yl)d^(1FKOClf)}VH+V5hOAT_elEGpW z7G?3zix9cfDA%80Sj7jLxL_2k#$eQ=QYhTE=?Xa8gNJ(s+u-;w)7SBt_S5Sifw3EY z#hF_zXZgkP1WV!H9Iy>s+VI6OP8e%nzqts4Go|tw99)`dy7)J)lV?6?;{3=pompWW zIq%bDp!AD^CrPsxNvYQTr;=19Bf@zuDa$Ukpi1s5x9JZeHLd{{l3&9|!j-?31q`lkAG#VsE`^Xj;RW0~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/gorochu/shiny.pal b/gfx/pokemon/gorochu/shiny.pal index 5c88669..1861bff 100644 --- a/gfx/pokemon/gorochu/shiny.pal +++ b/gfx/pokemon/gorochu/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 21, 16, 14 + RGB 21, 04, 06 \ No newline at end of file diff --git a/gfx/pokemon/nidoqueen/shiny.pal b/gfx/pokemon/nidoqueen/shiny.pal index b27c118..25ea81f 100644 --- a/gfx/pokemon/nidoqueen/shiny.pal +++ b/gfx/pokemon/nidoqueen/shiny.pal @@ -1,4 +1,4 @@ - RGB 31, 16, 31 - RGB 11, 13, 08 + RGB 26, 27, 17 + RGB 28, 09, 24 diff --git a/gfx/pokemon/pendraken/front.png b/gfx/pokemon/pendraken/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..94e69894f95a1b2a9f6e58195071f9cb900cc3f5 100644 GIT binary patch literal 784 zcmV+r1MmEaP)UTi%Wh5V*M`&+Jy>8`6p?N_-k<%n}mYrb{8eb2Nq{z3KI6+j?E7i-`JH|?tj7l zsG;+Sr2q@&eCTekOV%4lcrL zet?DnXil>2to}2y`70THWi&Xa7;K*=`728nU@A&Tfd-V0$MW@)?`v-=+v z>O#vkGo=fCVtD8;N*IUnfVi~ATAC~pM1ycq**hLp2`ktsH6uS;He;&>t9B_;4lC@s zX1N>G7or8%IQ3;aLAy7>T%sT3xmltZ%GDgL54e?In%g#6(VH73Z|R%)BMwZsT&3I- zz0H=H+Ay%xO<~$b9xQ(bbr$G>P#O&-Jje;IFl3piU4a+bpptk@N(o;aq{#+97{0g% zIWldXw&xrCxcr)>F)J`M2Uqq*-r(XK7Fpde?IaC6<_yQQ$gX(JjKmwH>*opxU6L_5 zL4Svk<>`x_l{&b7~`kZ_9JmsY55fK2eiy}>TJD;`o{4s^}Zb6qv4hQ8TW$@_4^J~8bB zc))1xikruf5UW8aji{0qxF+#1XZOG3b<)d%q8}OBoG}~nF6n#Lkg_qiOA&&NuD}&% zPe?sms1JBO-a=eCfY6UWqw$ O0000~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index d8d026e..db0e584 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, WARFURS + getmonname STRING_BUFFER_3, WEARLYCAN writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke WARFURS, 23, RARE_CANDY + givepoke WEARLYCAN, 53, RARE_CANDY closetext end @@ -39,11 +39,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry BELLSPROUT + cry NIDOQUEEN pause 15 closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_INVERSE - loadwildmon BELLSPROUT, 10 + loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY + loadwildmon NIDOQUEEN, 10 startbattle reloadmapafterbattle end @@ -56,11 +56,11 @@ DebugPokemon4Script: faceplayer opentext writetext DebugTextB - cry KLEAVOR + cry GOROCHU pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon KLEAVOR, 10 + loadwildmon GOROCHU, 69 startbattle reloadmapafterbattle end