From 12cbb0b30f790b18aef98078b804d2cda76c55b3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 12 Jan 2023 15:15:48 -0500 Subject: [PATCH] Colorize and combine birch_bag/birch_grass --- graphics/starter_choose/birch_bag.png | Bin 1304 -> 0 bytes graphics/starter_choose/birch_grass.png | Bin 691 -> 0 bytes graphics/starter_choose/tiles.png | Bin 0 -> 1928 bytes graphics_file_rules.mk | 3 --- include/starter_choose.h | 4 ++-- src/credits.c | 4 ++-- src/save_failed_screen.c | 4 ++-- src/starter_choose.c | 13 ++++--------- 8 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 graphics/starter_choose/birch_bag.png delete mode 100644 graphics/starter_choose/birch_grass.png create mode 100644 graphics/starter_choose/tiles.png diff --git a/graphics/starter_choose/birch_bag.png b/graphics/starter_choose/birch_bag.png deleted file mode 100644 index 86bfbbbc0a3aae8d4bf4b8ba8f716030c82606fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1304 zcmV+z1?T#SP)3j1-8jW1bWru}qWPLyLd2gPSq|>oimo_f_ zuhl(v!`GjaKXP5S{}~d;u2>C;9_N4UlaE}rED64%bliq;QoeGlWk~cmWl0jZAd;BH zM+Tsj=)v}hSi2Aohnpg|zEA?=EYWL9Uh(bu6*^jZmkenwE)nTAK#ZRqTlv20j>3AJ zbN=@>f`hl&1-M6UKk$dtjN`otY4!mH8U^$b;rqUpNOkqes|H{NdAk7b2oW9-q(s$! zXWCF$HyZ%E1400VgxUP*56u=(GT2gp27pBEe!GSqi(M}oSOR_V)mJOr3BUq88Z-qe zfJtyds|h`E0^TTS3RD39^$vjSpf@VZCL^NU3e5`(e; z!yv2x5v67qPkdSSL7wN}kY8K{ZaEW!K`Bs%oUjJy`o6fm|6QJ6=J^dEuBxFb4UAB? z4mg2N#l7Fc=Hg$T-|C?nXaf)^LsMDO{D zrhpDjsRal%;lNOkz4Wv}ScPKzzj2HXi6Tu{nhMxUUl|Ai35W?CqB%%T7!pbX*~x{e z0A)ng5hy@RXb9h#@6~BULmCA_;y@~tgbQ(92>`%>d=%9Wp)*CIB=}gw!YCr2$9Vl4 zk%xC{MBr;!9|L$9h>s<~U*wlJMiF-e2t!8Yj}#)difH{&=$)B_Lotq8VIKG-##bsK zQz9E73~CQ!Z}XrCco_cD=;I|`c@a?t;aJ6mLG6XqW12vTEJ7dU#hs8Ml)>gDfLa2b z9<37&ONBe4&X7?PUcxsKmY~$d&<|wajNGyML^17^BsBkRTKc%u*uKAnFM@}ITVrN<~#G9-Z`b$pn3Xa z5<+Y*rHRTn`)>d?oZdsJr%xpzkOFHwy0$n1GLH4Xdk+NNN+AGOQDA3U0y2((84w<; zx#ep{#~`rn^y_Prog?AhtVS5~n9;P=Up0XP;dEva7<7Qq=RGRuh`&jI@Xt&Ueh~$5 zco4>ueJap|%}f#=vjj&Mj)48NpMW9=z*CkL#XWq-afn-5h$s9tEJfJN-alq%1*`{| zr{fj@695yv!OaT=z&r}w`J$N5F`i{=AbDF0ZNPF_6d$v!e1T2cTG%wmvR@}$ zO%fK+a)uV*t1Rn$`R8QvHdb%2mJT!kaslEkj=(-cycGbeDEMA~F8>SG>pV$S634y( O00003>oKi}AK{;A6AUPoa{{a900RR60|Nj90{{a9008(>7qZZ)T0006$ zNklPzh`p7x#jll-CY4tT=+^YL1v@9 z?E<2_`^Yr`4pYD>_iwoX`me46V2rCT$pN@hh7AB6l6#h?Vpqa`0LEUjFOLHr%`w3J zRHl!BPZP3{%_f7NsvZOnYHFt2T*n0<1$gz9R+WVA^>Xj4c5 z-M${8McP_vnZd65XTa!O+2s{r9LP({VkiJyzpsw~LJIJNfHd2=0{qtfUjU3mibopQ zv`fDLD1LLKp8!mNjGC=p0Z@o|V89#DDyA2El<`TT8h%N~>u>>(QypN46-S$G&<(rC zgC5;~1B^~Ndl*x9D}e4k-VgON0PQOQ0(i(NPzR4={R|KvFx5j@h&Dukf%`ImWR3E{ zDqy3&AWbQl`_&A@7(e(H(CV+sQ~+)RpqN=tn( zTS;}mcB3!{d3(9aLngZc!j6G4<_Gx=pahX?1Xz_%k2=770%nM0VlarA`UD_vdyk|A zP%UAM`6sUc5G#;1J2{2T4ghulAsRvQ@cWYhO2-)bXHe$=69t3(->L$xxZ;W{uDD_q Z{{ZqzPeUcM&X@oI002ovPDHLkV1hGXF^~WN diff --git a/graphics/starter_choose/tiles.png b/graphics/starter_choose/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..175b30f9d16529927759e4b1ea91987dda8981dd GIT binary patch literal 1928 zcmV;32Y2|1P)C00001b5ch_0Itp) z=>Px#U{Fj{MRUcZ|J9WL#aiC1TD_cFlyg#pQc5{mVoEVN0Ah;(F+tVU-khA2Vq$Xu zQgZ+R0E^yp#paZY-gE!|0CT-!Vw_S+dqFu`F(5f0|Nj90{{a900RR60|Nj90{{T{R zL23^eRR916)=5M`RCt{2nCo_^^mJI?yGQ0n=7w*QPlwNH+J!=Rorb}$SSx5>B9G*%fvT2Wkv&>DwOnfw}q zQ`Z#NAZP&i&C{=ahaFv=R97C<=b*ne@sRBwtVRzb}0yu{H_*)iW1u%VR?KOm0KP5nh z(*VK#M%5Wo{S2Urpj)+0Fo^OuH5)Sh0svfm4nW1@mTcIk-!!Fu1Az55OxwR{OoGtl z`W1qb60VwS7C`&QBb)xa@1+e+K5?Zf5tPgZ1J(dk(_n@RLu0-%dJ`B*>6ZzLsS-f7 z2Bhy?<^`^2eS9H?=7@d)04q?n0Q47UvC=O6Z~l)M(1v_sG&w<8hzzI!D7tVNwQc)F zzxNE~#i6X93#kkQN@vA$=K)oRl$v z(ZPmR3w_>Ow>)gSwhBCGCm=#*vH1l^#E&46Wy2uwTy^)|rze$-z(m|8QKh`?wa zEkK(9TVIZc}<60RV}u>k9%nc_{6ADn@lfFP0+#@I5 zL9-(=l7 zLKnPb9G6Fej)vOGl8Ub>IHrCfm!(S6;fUaBmPk((e zLdqcY`KhcEzo5MUbe(_f4FHUg*q}uI`bK?h0@U{i1W-qC{^P&ly7_^CCITbqpRYQC z=KACM@w&?ZhcI}A!2<+@PNvWOce8$k(0zSH2v8sGyWTI?THmd|AS?i+-5Cu36x`n~ z^rZ%zIYy2Ip^LRCV)@VjCsVBgIEF6PUI4^x@7e@d1AqYW9)5ffPc#*Vs|~mb;Ppv6 zTZw%Coo~QB4v;p8q`Q=0|CI@_0YLo+{~P0kB!WJ1}+Ql5zU>jpM zfEQoUP64i#z-Fm$i8H{S({=$^nfl&Q=lR$?r~+6R$fEoabp|+MK^*|bamgQYbfhb9 z0hr$J!|DXEX+hMC6#(l14$BjO>w?&Z>eR>pT<1-we_TBPz_m8|IDRKEasW#soJl?a zkOlK3O_;^;S_#nlEAkA01hWlk1IlbG=cfSB!k~XzJ^(--kPUwZDDzwyGzEaC`#?05B7P9VcQzKai$ShsV|j|{2<@q=Z5kZ0VZCX_yx|e zvJ>os3lBG*@ech2fcnr1fGKGNECJ*WM;B*b1;8oW~{dj9YpS*cMMeV27?yNg$eyD0CNDCD0N=iTpiX6aVG%& z)j9ymenyJ1Qi$mUfUWib1$E!d!hB*Sh^i6vRU|a=2!C;0vCJJ5?l2+I)8~~DAP!Yfi5bF=< zJHW`ht?3HDxCxMg(81*TFTnn!-306dm_2~o>r6`>P5_K&0jBU` z-JO2^%K&zHL4XO@h3Rhs2o&1UQ5**N#3w%SiBEju6QB6RCqD7NkN*HHZ{Wd!Af%!I O0000$@ - $(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -Wnum_tiles diff --git a/include/starter_choose.h b/include/starter_choose.h index 7a4f6e967b..1bee42a2e8 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -1,10 +1,10 @@ #ifndef GUARD_STARTER_CHOOSE_H #define GUARD_STARTER_CHOOSE_H -extern const u16 gBirchBagGrassPal[2][16]; +extern const u16 gBirchBagGrass_Pal[]; extern const u32 gBirchBagTilemap[]; extern const u32 gBirchGrassTilemap[]; -extern const u32 gBirchHelpGfx[]; +extern const u32 gBirchBagGrass_Gfx[]; extern const u32 gPokeballSelection_Gfx[]; u16 GetStarterPokemon(u16 chosenStarterId); diff --git a/src/credits.c b/src/credits.c index 4156e45ba4..94bc0c4a6c 100644 --- a/src/credits.c +++ b/src/credits.c @@ -547,9 +547,9 @@ static void Task_LoadShowMons(u8 taskId) ResetAllPicSprites(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); - LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2); + LoadPalette(gBirchBagGrass_Pal + 1, 1, 31 * 2); for (i = 0; i < MON_PIC_SIZE; i++) gDecompressionBuffer[i] = 0x11; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 877482728f..d632c553a8 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -196,7 +196,7 @@ static void CB2_SaveFailedScreen(void) DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(14))); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(15))); LZ77UnCompVram(sSaveFailedClockGfx, (void *)(OBJ_VRAM0 + 0x20)); @@ -214,7 +214,7 @@ static void CB2_SaveFailedScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadPalette(gBirchBagGrass_Pal, 0, 0x40); LoadPalette(sSaveFailedClockPal, 0x100, 0x20); LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20); LoadPalette(gStandardMenuPalette, 0xF0, 0x20); diff --git a/src/starter_choose.c b/src/starter_choose.c index cbe0c7ee61..67f762d801 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -51,17 +51,12 @@ static void SpriteCB_StarterPokemon(struct Sprite *sprite); static u16 sStarterLabelWindowId; -const u16 gBirchBagGrassPal[][16] = -{ - INCBIN_U16("graphics/starter_choose/birch_bag.gbapal"), - INCBIN_U16("graphics/starter_choose/birch_grass.gbapal"), -}; - +const u16 gBirchBagGrass_Pal[] = INCBIN_U16("graphics/starter_choose/tiles.gbapal"); static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/starter_choose/pokeball_selection.gbapal"); static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/starter_choose/starter_circle.gbapal"); const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz"); const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz"); -const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/starter_choose/birch_help.4bpp.lz"); // Birch bag and grass combined +const u32 gBirchBagGrass_Gfx[] = INCBIN_U32("graphics/starter_choose/tiles.4bpp.lz"); const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/starter_choose/pokeball_selection.4bpp.lz"); static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/starter_choose/starter_circle.4bpp.lz"); @@ -402,7 +397,7 @@ void CB2_ChooseStarter(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); + LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(BG_SCREEN_ADDR(6))); LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7))); @@ -421,7 +416,7 @@ void CB2_ChooseStarter(void) ResetAllPicSprites(); LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20); - LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadPalette(gBirchBagGrass_Pal, 0, sizeof(gBirchBagGrass_Pal)); LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]); LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]); LoadSpritePalettes(sSpritePalettes_StarterChoose);