From 180f7854bfc5a16f4475084a6b6f2e1789318bfb Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sun, 25 Sep 2022 13:45:54 +0100 Subject: [PATCH] new border! --- data/pokemon/new_dex_text.asm | 38 ++++++++++----------- data/sgb/sgb_border.asm | 62 ++++++++-------------------------- gfx/sgb/red_border.png | Bin 1048 -> 0 bytes gfx/sgb/red_border.tilemap | Bin 1792 -> 0 bytes gfx/sgb/sgb_border.png | Bin 0 -> 986 bytes gfx/sgb/sgb_border.tilemap | Bin 0 -> 1792 bytes 6 files changed, 33 insertions(+), 67 deletions(-) delete mode 100644 gfx/sgb/red_border.png delete mode 100644 gfx/sgb/red_border.tilemap create mode 100644 gfx/sgb/sgb_border.png create mode 100644 gfx/sgb/sgb_border.tilemap diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 348b36cc..eb104b9d 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -19,13 +19,13 @@ _GuardiaDexEntry:: dex _DeerDexEntry:: - text "Once hunted" - next "in the past for" - next "its impressive" + text "It wildly swings" + next "its huge antlers" + next "to deter threats." - page "antlers, it's" - next "now under strict" - next "protection" + page "However, these" + next "antlers are highly" + next "prized by hunters" dex _MadaamuDexEntry:: @@ -265,7 +265,7 @@ _CroakozunaDexEntry:: page "Then, it strikes" next "with a flurry" - next "of strong slaps." + next "of strong slaps" dex _GorotoraDexEntry:: @@ -275,7 +275,7 @@ _GorotoraDexEntry:: page "only be tamed" next "by the bravest" - next "#MON TRAINERs" + next "#MON trainers" dex _OmegaDexEntry:: @@ -299,14 +299,14 @@ _PurakkusuDexEntry:: dex _TrampelDexEntry:: - text "A rare species" - next "that's well-known" - next "in India. It has" + text "A rare species" + next "that's well-known" + next "in India. It has" - page "a bulky physique," - next "but it's adept at" - next "using its trunk" - dex + page "a bulky physique," + next "but it's adept at" + next "using its trunk" + dex _CrockyDexEntry:: text "Its huge eyes can" @@ -359,13 +359,13 @@ _BarundaDexEntry:: dex _TsubomittoDexEntry:: - text "A larger form" - next "of BELLSPROUT" - next "revered elsewhere." + text "A plant #MON" + next "that's revered in" + next "another region." page "It can absorb" next "useful nutrients" - next "found in soil." + next "found in soil" dex _AnimonDexEntry:: diff --git a/data/sgb/sgb_border.asm b/data/sgb/sgb_border.asm index aa11a326..96c77344 100644 --- a/data/sgb/sgb_border.asm +++ b/data/sgb/sgb_border.asm @@ -1,62 +1,28 @@ BorderPalettes: -IF DEF(_RED) - INCBIN "gfx/sgb/red_border.tilemap" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/sgb/blue_border.tilemap" -ENDC + INCBIN "gfx/sgb/sgb_border.tilemap" ds $100 -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB1 - RGB 25,22,25 - RGB 25,17,21 - RGB 24,14,12 -ENDC -IF DEF(_BLUE) - RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O) - RGB 10,17,26 - RGB 5,9,20 - RGB 16,20,27 -ENDC + RGB 31,31,31 ; PAL_SGB1 + RGB 31,31,00 + RGB 16,18,31 + RGB 03,03,03 ds $18 -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB2 - RGB 22,31,16 - RGB 27,20,6 - RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB2 - RGB 27,11,6 - RGB 5,9,20 - RGB 28,25,15 -ENDC + RGB 31,31,31 ; PAL_SGB2 + RGB 31,17,00 + RGB 28,14,00 + RGB 03,03,03 ds $18 -IF DEF(_RED) - RGB 30,29,29 ; PAL_SGB3 - RGB 31,31,17 - RGB 18,21,29 - RGB 15,15,15 -ENDC -IF DEF(_BLUE) - RGB 30,29,29 ; PAL_SGB3 - RGB 12,15,11 - RGB 5,9,20 - RGB 14,22,17 -ENDC + RGB 31,31,31 ; PAL_SGB3 + RGB 31,15,18 + RGB 01,22,06 + RGB 03,03,03 ds $18 SGBBorderGraphics: -IF DEF(_RED) - INCBIN "gfx/sgb/red_border.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/sgb/blue_border.2bpp" -ENDC + INCBIN "gfx/sgb/sgb_border.2bpp" diff --git a/gfx/sgb/red_border.png b/gfx/sgb/red_border.png deleted file mode 100644 index 7549bb47e8c348285914a862b9353fc3cb1e3897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1048 zcmV+z1n2vSP)9TWpiPIacL=oY z6d(u!q!06%P_V#+1{xX~T>=2P*1jJEJ_`axDeW2kXmGgi@B08YfqK^1lRmcz5`0F} zk7o||5BjS<%sn7L8|21J`sJ0QvjWO9;l^#YqSmX~lKY@?^&NNnC}6YVbTx;H z3wI+wf^{jfB@2+y*mL92d${I`1q@Igy1&dD@gUb9FByC&@4K3D^xZsH3_qtKj?qU| zodDbHG98pY;#^j!6coA1jE-j;3~cRZKovYr*Br%xwl8w^0u(O@c()*gfxX$0VDd*6 zJQ{hb@qQMc0U2+M!SLznq6OaN)fbJ{6s&ERG7z4oX=3MKUSS#G4v2^OGQS0n3G9x1 zrSE~2RO|61Plx6c7P;G(%anlAgu&{`ozSzv=16 zqUzM17<0W5i7PHwF$2Ie;F;(8V7cJbXlpM-BoJ#t&1L}az^})`simH|IgCW0@*?-p z0vv;y1%rrsFHH}G%PXnJ{|+v+IgcEAyy^AFf=ah&I9RYkgkB4wNe|3P6?-55CQzRgU#{9WyLEAgWyvXVyOQ3-UhDRbcM)wFLym*3h7Qi?GEA-aH z$YI`V-77_IHw>56e18HcK`j>3m`9G<)CawU9{0;IC;k3p2ucXI;+feFfl^s~)TM$M zg-cBIv!cxss!O?dZ9=%!&TmmY>{7WaA+oa1!1|Z!DWf@1NlRPR@z9+6(Ekf|2#!E_ SZPDQX0000n^|6AB4*<#daUyzsmgAKpT4w+ez zL6HipE)A)&s%TrbE+HaBCN!CRoe>$5VZpcktjjby-a|%=@-Xk0T8}f(WvspjAHMNS zQ~G**n&Q!?pL@C0U&R{M5kSLla*NyCq18XaF-~x*;?H=_3trOd8{FX@4=O(ABcJ$O z=m#dlhVuMDo-t!k=qGG;R$5?%re+}=L z|In|RKbJ+#`JJZq@3N@jUFNNS*Iy0qI&1ZJv4?%cs{W00f|HDk{$1f3H@H>he~Qzb z;cSur7rf#P?<#(d^IYI!k^dM=SjLKqk2y+mtk8E|IOy^As>z`^#{PfTg|D~gZ|{!z Xoc}V@WhegLEBjY=O0%cY`sv#bjwyp7 diff --git a/gfx/sgb/sgb_border.png b/gfx/sgb/sgb_border.png new file mode 100644 index 0000000000000000000000000000000000000000..f88b6c5146b20a7a77be7b3dc73da921bdf5f240 GIT binary patch literal 986 zcmeAS@N?(olHy`uVBq!ia0vp^4M1$b!VDy}Z{_y_DfSXiUsv{LoMODnoV(dlW&?%9 zOI#yLg7ec#$`gxH8QgtbfW|14r4}g|>zNd`E_n!4!ckJ-=MI!H2C^Bv8Z_mB6id3J zuOkD)#(wTUiL5}rL4Z$)E07Ki4PCWr)&Kwhfoy_6Xyc7Apd!X3Z+DmfOW8jiWnf_X z=jq}YQZeW4)Y!h;20SgAub3|Ja=c^Ra`Er`kS|Pc&s->+qfq%OdZUxj5wowIGXHLv zO}qN*=={nxHrFa;ztz-<%BV|7&pfDQ{rb z+s?=>+s*AIz;fi%3%-WjTk{lUR+{XZ;U`!ru4JUbAaLh}8^hF3V#$ZfJWm#~^0f5x zyEHAB$M5iM#93<-YsPt6iEn3=}(V$-E1F>@3d41UM0>3y)>bk5z&4?k-#teJUK z=wd|W-r4pH8`VpSWe@z#RouAdQQCQi$^*P#7#NzLS*ZOse_Ok1QLY`sw{y(Xidqf6 z-MSX8%wXox^O7O6!71#aEJLQk#aUI2zbF69{h}aN{$q)#U&qRQ!M|-&8^0!JsZIXZ z|7=sfjb}x`-lRwtv5UeFf~~cenZNzBE6&`AJ5l5IX}4v^%S!ERBy!}u9Czxg^V=os zAGLOPV#P3_|C2JG*{Y9wq*VA;?$LbvqN;NBGVk{W$?P{d6Bb4O5ZZA&iPL!gH_=tx z%dThL(b#R#)Uc(R<4b~^+=2aDIU3j*&R9RN^LWSbX2;U314|m63Yf&~e6IJN-S>o( zM?}N)k;#Tx=}dd{LN_c-dFlB2#HMx^*&L-^wK3U#$E+Ei*Oc>hbA*U$X|G@W#-r5t zRXM|t`{Cui^5waCXTB_78WWb_r@DCYYfgvf$x>#k%Nwt6$z)y=aBWo$*8|1IN$+_W zo*ew5zneAGi|;CvL#F40LjCzsEGd-%&G*7KT{jO+mix=m__UI7PNA&ahpS0aDs!7# z79=b$obY@y`%2FUxjUv4xN53rzP7d6^gddILHH*_L}o(hf#q!PcTJ3*^WMbh`HwlR w*GtP5tMTri^xQb%|Knebe;Dc*{_{T2cefAaI#=)X7nFBAUHx3vIVCg!0A4zlw*UYD literal 0 HcmV?d00001 diff --git a/gfx/sgb/sgb_border.tilemap b/gfx/sgb/sgb_border.tilemap new file mode 100644 index 0000000000000000000000000000000000000000..a9b85587a7bd4863a9473a30335698d881f3ef82 GIT binary patch literal 1792 zcmeH{$xZ@65Qc4cT*%+}i{(ZXWl`DU3NG*pbC|$Q-)kK@X%3olf_c zTK=kX82rLq;<1hmY|55wv&0?jVo&y^EamK)4K~^0Fd5=j?xe#`+E4qO|L@^J9HJ^m zB0S~^PH`sZQj=Qt$R|GYg`;GIwzRVwcG*jNod2)9`EkK{xWwX8-u!sH=5~oXu28`N z9DIfl0yDQ~rn;Y|zWt+p||X`#I7 z8N*w@C~tbk@YXNNoBlC;vHs!uE%pDN#ijoLY5sM8Ef^Q>U+*48^Y5mEzzynVMf3kR M`#(JDqU_x46DSRk1^@s6 literal 0 HcmV?d00001