From 2abab09c87898cd7926bcbc5a11bfc3341dab482 Mon Sep 17 00:00:00 2001 From: Misty Date: Sat, 1 Feb 2025 18:24:18 -0500 Subject: [PATCH] Feradactyl Fix + rom builds now Rom was messing up due to pics 25's size, so I fixed that alongside Feradactyl's bg color. Hopefully will get the moveset rebalances out soon. --- gfx/pics.asm | 15 +++++++++------ gfx/pokemon/feradactyl/back.png | Bin 436 -> 934 bytes gfx/pokemon/feradactyl/front.png | Bin 567 -> 1065 bytes maps/DebugRoom.asm | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gfx/pics.asm b/gfx/pics.asm index 97306c6..c3c8002 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -982,12 +982,6 @@ BittybatFrontpic: INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz" BittybatBackpic: INCBIN "gfx/pokemon/bittybat/back.2bpp.lz" ParasporFrontpic: INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz" ParasporBackpic: INCBIN "gfx/pokemon/paraspor/back.2bpp.lz" -VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz" -VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz" -AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" -AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" -PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" -PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz" SECTION "Pics 25", ROMX @@ -1062,6 +1056,15 @@ KuyePic: INCBIN "gfx/trainers/kuye.2bpp.lz" ShamPic: INCBIN "gfx/trainers/executive_f.2bpp.lz" CarlPic: INCBIN "gfx/trainers/executive_m.2bpp.lz" +SECTION "Pics 27", ROMX + +VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz" +VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz" +AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" +AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" +PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" +PupperonBackpic: INCBIN "gfx/pokemon/pupperon/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/feradactyl/back.png b/gfx/pokemon/feradactyl/back.png index 903a6d1d3e6036ecdd33e46d82e3a467da56c7ff..3ec89032de2ab8c2d0a186a5a75fc93599ccfc1b 100644 GIT binary patch delta 924 zcmV;N17rNO1EvR%7=Ho-0000gY!MUy00D$)LqkwWLqi~Na&Km7Y-IodD3N`UJxIe) z6opSyr6LuFb`Wt0Qk^VF6>*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i;4ld5RI=Bjg z;17tq;H2mxCEk}5TEuwa@jlMG=kVTrfY7Wm)$ExBRLwHdiGR45%dd)oR|xPSgcwF8 zX6nhzViunDbx*xicTt|@-S=k=C4rtTK|Hf*>74h8!>lYR#OK5l23?T& zk?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs$PqkJLfvch?bvs$gQ_C5Ivg9U9R z!*yCCNMH#`q<;kQZZGRuzcIyQ2KLb}<$6sp#v!A3lI$Goi7~BRft~;8%2VCv| zLr=P7NRH&EB@~Om`x$*x9thn6{cG;r+UGcZ0J1cz<$oLC;1C!uQTDpWyZgH5_HR#n zem|dEa=8yTiq-%C01Qw}R7Lps_^7C;P*|V<003O&F$4er00Cl4M??UK1szBL000Sa zNLh0L01FcU01FcV0GgZ_00007bV*G`2k8O<6&fo!pSJG+000?uMObu0Z*6U5Zgc=c za%Ew3Wq)KKcWHEJAV*0}P*;Ht7XSbOYe_^wR4C7_(7j8;P!Is{qd`(6X%Pu74h0t% zAxo`bK?lXvl2nJmhTpq!HKxh@|(ygL*Nz?iV zc+0yV_wL>Yz(2)LZP=SV-fr0B#ot1ttDxu9idx zU^IX!aStFG?0iCQi6;CO9qnn_Y=$jUv}lY3wIt3!o9x3iP0%KSejB3N01jtq9;v7V z#dy5%F+xWwc&sBmTt_}%zUt`tpt`p>p0_)Yl#CQCb@L8^?%#P?9m8UPNL;}c>1=^V zXMgroWfT(GT1ho10$!&tW(^aZguA3K>Uf9Ng4 yy596rtMM#x$$+*f`1XYmAj8FiYUN4D)22bLW5u(7Q!bW2Ts0J94* zc11M4{o!Wp=zqE>B59A#D{2ADQA8&KJdJ)^Fq-KZc7Fwcs;2 Q0ssI207*qoM6N<$f@l4_5dZ)H diff --git a/gfx/pokemon/feradactyl/front.png b/gfx/pokemon/feradactyl/front.png index ff3ade3cf497fb2518c2ab1483490788677f0922..25c4f111ae65e73d310e9e9f99dbcb4b7c91349d 100644 GIT binary patch delta 1056 zcmV+*1mF9&1gQv+7=Ho-0002h=+lh=00D$)LqkwWLqi~Na&Km7Y-IodD3N`UJxIe) z6opSyr6LuFb`Wt0Qk^VF6>*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i;4ld5RI=Bjg z;17tq;H2mxCEk}5TEuwa@jlMG=kVTrfY7Wm)$ExBRLwHdiGR45%dd)oR|xPSgcwF8 zX6nhzViunDbx*xicTt|@-S=k=C4rtTK|Hf*>74h8!>lYR#OK5l23?T& zk?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs$PqkJLfvch?bvs$gQ_C5Ivg9U9R z!*yCCNMH#`q<;kQZZGRuzcIyQ2KLb}<$6sp#v!A3lI$Goi7~BRft~;8%2VCv| zLr=P7NRH&EB@~Om`x$*x9thn6{cG;r+UGcZ0J1cz<$oLC;1C!uQTDpWyZgH5_HR#n zem|dEa=8yTiq-%C01Qw}R7Lps_^7C;P*|V<003O&F$4er00Cl4M??UK1szBL000Sa zNLh0L01FcU01FcV0GgZ_00007bV*G`2k8O<6&DJ?SlIjk000?uMObu0Z*6U5Zgc=c za%Ew3Wq)KKcWHEJAV*0}P*;Ht7XSbO?ny*JR4C7l)4y-iKoke?E7zzDDIr4?RcuJ? zRV9Ofv|*qdY+R01HD)2Gkx+wBsZ>(RpU@>jq%#BO{OD2!2O6V_0Z|0YDGQ328z8Pk zfR@US!)ISF8{R&;_wK&-J0tWz&j|p~}>`-b??q9_2wE* zO@8EsXFETqa*b^};JJJOk%c*@B?oHcpW+lPfG?XXCcQ?iDp_*^a+4;B^LViglEB5iXS;iK2@+ z)=mt>V4eir0rtr=#eI6aUl!a&GcHOCc8q@~cnHH4(n09+g=ieWe<75~s9{Zi92xpQ a66h~&4%tpAHARsC0000FnPL^=NdpCe$wi4IG4r|ogyMtOkx|x}dawW& s8w1y9Nh1ey{n)SQXRj{v{HOl{J|-6)USvlQga7~l07*qoM6N<$f~WohoB#j- diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 1826396..0d9b957 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, BIPULLA + getmonname STRING_BUFFER_3, FERADACTYL writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke BIPULLA, 15, HM_WATER_SPORT + givepoke FERADACTYL, 15, HM_WATER_SPORT closetext end