From d883c40fff8d37d51badcfbaebb45a4f9819e1aa Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 14 Dec 2022 10:43:20 +0000 Subject: [PATCH] New sprites and a warp to the crater Added new sprites, plus a redesigned Scizor one. Crater warps have been added but are glitchy as of right now --- data/maps/objects/MtMoonB1F.asm | 2 ++ data/maps/objects/MtMoonB2F.asm | 5 +++-- data/maps/objects/MtMoonCrater.asm | 4 ++-- data/pokemon/dex_text.asm | 12 ++++++------ data/pokemon/new_dex_text.asm | 30 +++++++++++++++++++++++++++++ data/pokemon/palettes.asm | 2 +- gfx/pokemon/back/meltanb.png | Bin 0 -> 407 bytes gfx/pokemon/back/mr.rimeb.png | Bin 0 -> 423 bytes gfx/pokemon/back/scizorb.png | Bin 619 -> 454 bytes gfx/pokemon/back/sirfetchdb.png | Bin 0 -> 577 bytes gfx/pokemon/front/melmetal.png | Bin 0 -> 918 bytes gfx/pokemon/front/meltan.png | Bin 0 -> 558 bytes gfx/pokemon/front/mr.rime.png | Bin 0 -> 822 bytes gfx/pokemon/front/scizor.png | Bin 693 -> 884 bytes gfx/pokemon/front/sirfetchd.png | Bin 0 -> 605 bytes maps/MtMoonB1F.blk | 2 +- maps/MtMoonB2F.blk | 2 +- maps/MtMoonCrater.blk | Bin 625 -> 625 bytes 18 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 gfx/pokemon/back/meltanb.png create mode 100644 gfx/pokemon/back/mr.rimeb.png create mode 100644 gfx/pokemon/back/sirfetchdb.png create mode 100644 gfx/pokemon/front/melmetal.png create mode 100644 gfx/pokemon/front/meltan.png create mode 100644 gfx/pokemon/front/mr.rime.png create mode 100644 gfx/pokemon/front/sirfetchd.png diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index a989a295..495fb5ab 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -10,6 +10,8 @@ MtMoonB1F_Object: warp_event 13, 27, MT_MOON_B2F, 3 warp_event 23, 3, MT_MOON_B2F, 4 warp_event 27, 3, LAST_MAP, 3 + warp_event 1, 27, MT_MOON_B2F, 5 + warp_event 1, 23, MT_MOON_CRATER, 1 def_bg_events diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db88..c49171d2 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -6,6 +6,7 @@ MtMoonB2F_Object: warp_event 21, 17, MT_MOON_B1F, 5 warp_event 15, 27, MT_MOON_B1F, 6 warp_event 5, 7, MT_MOON_B1F, 7 + warp_event 29, 7, MT_MOON_B1F, 9 def_bg_events @@ -13,11 +14,11 @@ MtMoonB2F_Object: object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1 object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2 - object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 + object_event 34, 25, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3 object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4 object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP - object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH + object_event 21, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonCrater.asm b/data/maps/objects/MtMoonCrater.asm index 350d5990..71c66d43 100644 --- a/data/maps/objects/MtMoonCrater.asm +++ b/data/maps/objects/MtMoonCrater.asm @@ -2,8 +2,8 @@ MtMoonCrater_Object: db $0 ; border block def_warp_events - warp_event 23, 49, 0, LAST_MAP - warp_event 22, 49, 0, LAST_MAP + warp_event 23, 49, 10, LAST_MAP + warp_event 22, 49, 10, LAST_MAP def_bg_events diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 7fa47e1c..b844f151 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -751,13 +751,13 @@ _KabutopsDexEntry:: ; new entry dex _HorseaDexEntry:: ; new entry - text "When endangered," - next "it spits black" - next "ink. In spring," + text "Spits black ink" + next "when threatened." + next "It lays thousands" - page "it lays thousands" - next "of eggs, but many" - next "of them are eaten" + page "of eggs in spring" + next "but many are" + next "eaten by GOLDEEN" dex _SeadraDexEntry:: diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 1bfdf219..bcc2ffb8 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -748,6 +748,36 @@ _MelmetalDexEntry:: next "iron from nothing" dex +_SirfetchdDexEntry:: + text "FARFETCH'D that" + next "wield huge leeks" + next "evolve into this" + + page "form. It guards" + next "attacks using" + next "its leaf shield" + dex + +_MrRimeDexEntry:: + text "As it tap-dances" + next "around, it waves" + next "its icy cane in" + + page "perfect time," + next "conjuring potent" + next "psychic energy" + dex + +_PerrserkerDexEntry:: + text "A savage #MON" + next "with a body of" + next "iron. It uses its" + + page "dagger-like claws" + next "to tear into" + next "foes in battle" + dex + _ArticunoGDexEntry:: text "From its eyes," next "it fires beams" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 877b0bfc..48e6ad90 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -174,7 +174,7 @@ MonsterPalettes: db PAL_GREYMON ; RHYDON db PAL_BROWNMON ; RHYPERIOR db PAL_GREENMON ; SCYTHER - db PAL_GREENMON ; SCIZOR + db PAL_REDMON ; SCIZOR db PAL_BROWNMON ; KLEAVOR db PAL_BROWNMON ; PINSIR db PAL_BROWNMON ; PURAKKUSU diff --git a/gfx/pokemon/back/meltanb.png b/gfx/pokemon/back/meltanb.png new file mode 100644 index 0000000000000000000000000000000000000000..efdad8d1aa5d444bab06fcbc3aa0f4235eaa364a GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_GdhNoR%U+nX6oZLX7!Eej$wK7nRQfa%w$Y977~7 zC;#AQ%wXO z?4_ib3XieRIP7=GWz#aJs{&ud8Qj)gY`)%XeH`cz)e_f;l9a@fRIB8oR3OD*WME{Z zYY0RpAqJLKrsh_Lmf8jeRt5&TOWw{$(U6;;l9^VCMS}%I!>_)$=|Bw(p00i_>zopr E0D5(O+5i9m literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/mr.rimeb.png b/gfx/pokemon/back/mr.rimeb.png new file mode 100644 index 0000000000000000000000000000000000000000..0e698988635dea10ad1a9d99f53c317eae7b2af5 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv_7YEDSN3N-d|V8c)g?zS1BJv( zTq8FSQzu>&JZ!+>?7D{`M(o5=?gtzG=ZRjhdYS(7Lu)#ZkfV!*+Zu*q!@Khx&iMSW zym(+{c;^j`1#1M#9=58@U${HzY}9RRrJh{ z9a R_a5kB22WQ%mvv4FO#m>aYFPjP delta 491 zcmX@c{F-G#S3QS3zqMh|=WiSg3=E9PrM7{Am4U%2{by<@8glbfGSe!tXt022kYx?k18Rs$jqt2b z^YvxW0&+MQSQ&*Fn1L)tAY@>aVqgWc85q16rQz%#Mh&PMCI$v3VT5|1S`hF6VxVpa zEg$sV1jv5v>Eak7ak=*V#w;dB0k#L8DrZd_8wA$4%-(Ufv3~20mqAiNEGA3uW=eGe^icE3e-I`qE9r}5GPdL3k zB+;eBQ17rP5gDBVCBW$e`h89*fwsNYmjs1hjmuArJ!bgzopr0Lqi0d;kCd diff --git a/gfx/pokemon/back/sirfetchdb.png b/gfx/pokemon/back/sirfetchdb.png new file mode 100644 index 0000000000000000000000000000000000000000..f9c88c00212ec044cdd00d567b3c27300345aaef GIT binary patch literal 577 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_GdhNoEB=2m!1Ne$iSFiAV;;tHKHUX zu_V*GORf3U z-Wl(*Si@PuDgA8UrjMFAa$C+v?BM)vGDF<$!IwCXH-%Zb>rd=7)N(p>;wp=kK*i3m eKj+K;Jz(x$dZ}ijOj9b*GYp=telF{r5}E)ia-qin literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/melmetal.png b/gfx/pokemon/front/melmetal.png new file mode 100644 index 0000000000000000000000000000000000000000..9285935bd843887c1e9655c375b779b88a906468 GIT binary patch literal 918 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiAZK29t4xxaQq0EHOyi~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BO_fyATkLtu(UEYw=y-=HZZUUPZE~w^qjCv<-#6Wqg^xkN>}jxWsb4B=Hna1B{#jg z_MY|U!{T{AK76wIUMm;Z@t^NS@+pho_jgzxGk9>IL;QHu&zY7_ZXS=@X<_?h{nPTT zNmVBn{|=rXm*CL0QnXsg)6kE3zHTHR7bkzs`LOi+d_RtT&RMg6)1+%VbSp1!n0#%< z&y0fuREuv;KvnVN^SAeWEb5KJ~*qVcI_Ld$BR_0EKmNN z)o$~AZO3t&nB^`<8lD>+xmVo9p8HYtCh zHfK3}mYp{B&0d~u`61NIer1R7%c|TKSX3Qu;_D^y-mBwsrIP6J z*(!EDW!$mfj%cfdm|xqZcsEaN&#S3w?&p8oJYAH*C+TNkTF1qCwC?cN!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4Ba)9>uEyWHZUopMgU!{>}n$kZE=mp+6|J$0_BZQrI-cC4Qmb0f+lUH{}nw$Ch1 ztPO54vRKFdo?CFw#7UFdJ0_Ye4nNYjdf$=D%-bih-pJ~d*e-o}QS9f*bz8l6oY(%V zqr6YZEBNJy8JDj-o}_l_CHu^>_7~DIc~jH(e%QM(@UO_QmvAUQh^kM zk%5tst|1Vagcw*_nVMS}T51~@SQ!}TE_pj2MMG|WN@iLm77Z2<4Zr&0rUNxFc)I$z JtaD0e0ssy<$s+&& literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/mr.rime.png b/gfx/pokemon/front/mr.rime.png new file mode 100644 index 0000000000000000000000000000000000000000..e021e976085373d039dc1f93dddf60544b43af4b GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiAZK2CF^y5~%0Kq1EbBEJyE^NY%70XeEAt`Q|E zi6yC4$wjF^iowXh$Vk@^h)hBZEUipUtxPPn4GgRd3=%gQA4AcQo1c=IR*74Kz?<$W zpoXZ_2+uTMUj{88n}dOsQHX&V$YKOS21Y3cke7ih1}{cwI6H_@1F8lXP)x!I^+0tX z-~q%SJz!cs=(`D!yUo+ZF+}71)JulmGL9nbAO7#CwiKKc`7vyR(S&E0W@>4+NIr^F zX5YQZdaL4u^ApqpgO__ad1Oxhs&H?)#RbuwZU>Kfb!%^#b5+z?V&=PI}~&y?AJ z`&j?}EYFv{{QQelzR#$9y)xG`8^`!YVx7OIE zF}_XO<8;jagY}oil{`A!9UXrbPFuS~l%edelgpjf@LKXNL}7O=f$?nV`nG)<=rHEF(y82 z&kwGTZJOV9FRHmd`|pu;_VZ`&`&V^-sk(jr%t!gFCt3eKd!=CYx`w&`QjYF@`%vQ7 zA(8Laa|#TmM!A_f&ZtZ4s#ke>*Z8hUugjY3&V7cpQ{}T>ZeDyvE_P?uv1|Jzo;~C} zeOPUC&wBn(83kD@9yK>|T{iYU7xcB|mWJo9jdR`{o7Qi&u;waf?#GZrSAy@WWk=qV gd;9nJNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiAZK29^!pEH(S0SYnZ7x{%So?lcx3&>F|ag8WR zNi0dVN-jzTQVd20Mn<}ZKx7hPU}?aTHt^KT=(XL z8rj@ecyUYSwDy4w*JLIHJP~o&=oYx`{e~Xp1&O^)IrjJ7L@j%562ZXPFe6Z1PcS5~ zUGaRL3DX3|Ma2s~{l1nP)2_K_Zch|L;=c&Ti@QV`jOLxFx@a}~)C}E4dgmodE5e%6 zeI78iZF`ygrTY$t^(5*3XVRH2N2k>Us~%8$C$JzLY^6ft>A zN|)k239YtnOH=L*W+e-sm~e!C=55ewTAsKf?5I%79*(-zPh2@}ElGL8$)b4Y(N11& z2SL9o)#H|5lTNz)npgd8VvpM1U!Ur4g~{ZF?&#lM(c1Y}Of>81`OVhnpH}V)mFf@C vo^4pN+NU*mY1mpV-o0kWpUADhE6b zLCbjz)}q|AeShy4u7RUF!J6z)?7J(1pwO$OSY*|{^b-WvmH4L`^73 zbdL~a=KhnMtBTJ&Gqh7_J_=1ve0y*pno0W188W{Zy}j7)Q*zq7T3{ydC@knSB>7eZ z*t>QU>5zmpwlvZhRdQdDFLxi_Owv11200B$^`V($Xn!U|p@4K6SBjh(tuh!#27#Ei zV6bB#yf!%x#41jwryQ+SR@a6(C3<>+PgFHIpj8#lNFmKbtTsE;XG?(W<(U9`{ka2K zPphPRunW0465x_mR7q4NZ8Sfg>ErQ_F^%NIWFM_Q>6SIK6KNR14cO@&+1p}>E@by; z(Av9jCVygV6_F&Q8ei$*Xp7;dkw>HK%|K6S000X)^2oCQ_5l$QR-B7j{fFE`sf9KmY&$07*qoM6N<$ Ef+lA`6951J diff --git a/gfx/pokemon/front/sirfetchd.png b/gfx/pokemon/front/sirfetchd.png new file mode 100644 index 0000000000000000000000000000000000000000..e08bf8488b1bd0c22d2e007bb116fc1d3e957086 GIT binary patch literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&v^JaEmW)4%(epxG3FQfg)p99R6YyHcJ_2}4AD40 z^^(2!VFwAe57|eTDl9ZFL~)^ssPu zyx~^~Qp2tB%du#AejIazpR_)2f$}cTByxS|QZUxug=Gq1ZRt5$aYJN4MXvob^$xN%nqQMNJfj!K#6R3f~)78&qol`;+ E0A%0Zq5uE@ literal 0 HcmV?d00001 diff --git a/maps/MtMoonB1F.blk b/maps/MtMoonB1F.blk index ee1aa030..e9eede3d 100644 --- a/maps/MtMoonB1F.blk +++ b/maps/MtMoonB1F.blk @@ -1 +1 @@ -??????<==??????=<?????????=<???????< \ No newline at end of file +??????<==??????=<?????????=<??<???????<< \ No newline at end of file diff --git a/maps/MtMoonB2F.blk b/maps/MtMoonB2F.blk index 216fe705..c0ae79d0 100644 --- a/maps/MtMoonB2F.blk +++ b/maps/MtMoonB2F.blk @@ -1 +1 @@ -..................//......../fED/AB.@AB../=/)/333)+/> .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file +..................//......../fED/AB.@AB../=/=/333)+/>- .....//../3333/0...../D))E/=HI333/33JGGGGK/....@AB./../)///,/=/88888888889999999999 \ No newline at end of file diff --git a/maps/MtMoonCrater.blk b/maps/MtMoonCrater.blk index 18908b8b3a99058cadd1fccb2dc00bcb203fa2c7..ec8f76c8831148a46b89294530c94cf6a311d439 100644 GIT binary patch delta 23 acmey!@{wgj5)(gDB$JJ;t*w_M1ONb6sRnNV delta 23 acmey!@{wgj5)*%2WW9~8t*w_M1ONbKMh9pB