From 6eaaa50ad5252ee9c526be667800501d19aa482b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 9 Aug 2023 12:49:21 -0400 Subject: [PATCH] Correct berry fix graphics colors, more PLTT constant use (#1892) --- gflib/bg.c | 4 +- .../{gba_small.bin => gba_connect.bin} | Bin graphics/berry_fix/gba_connect.png | Bin 0 -> 9109 bytes graphics/berry_fix/gba_small.pal | 35 ------------ graphics/berry_fix/gba_small.png | Bin 982 -> 0 bytes graphics/berry_fix/gba_transfer.pal | 35 ------------ graphics/berry_fix/gba_transfer.png | Bin 900 -> 5480 bytes graphics/berry_fix/gba_transfer_error.pal | 35 ------------ graphics/berry_fix/gba_transfer_error.png | Bin 1014 -> 6279 bytes graphics/berry_fix/gba_transfer_highlight.pal | 35 ------------ graphics/berry_fix/gba_transfer_highlight.png | Bin 1060 -> 6354 bytes graphics/berry_fix/logo.pal | 51 ------------------ graphics/berry_fix/logo.png | Bin 811 -> 4566 bytes graphics/berry_fix/text.pal | 19 +++++++ graphics/berry_fix/window.pal | 35 ------------ graphics/berry_fix/window.png | Bin 211 -> 279 bytes include/graphics.h | 6 +-- src/berry_fix_graphics.c | 10 ++-- src/berry_fix_program.c | 20 +++---- src/data/graphics/berry_fix.h | 6 +-- 20 files changed, 39 insertions(+), 252 deletions(-) rename graphics/berry_fix/{gba_small.bin => gba_connect.bin} (100%) create mode 100644 graphics/berry_fix/gba_connect.png delete mode 100644 graphics/berry_fix/gba_small.pal delete mode 100644 graphics/berry_fix/gba_small.png delete mode 100644 graphics/berry_fix/gba_transfer.pal delete mode 100644 graphics/berry_fix/gba_transfer_error.pal delete mode 100644 graphics/berry_fix/gba_transfer_highlight.pal delete mode 100644 graphics/berry_fix/logo.pal create mode 100644 graphics/berry_fix/text.pal delete mode 100644 graphics/berry_fix/window.pal diff --git a/gflib/bg.c b/gflib/bg.c index 89f503824..4ccb95eb6 100644 --- a/gflib/bg.c +++ b/gflib/bg.c @@ -421,13 +421,11 @@ u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset) if (!IsInvalidBg32(bg)) { - u16 paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2); + u16 paletteOffset = PLTT_OFFSET_4BPP(sGpuBgConfigs2[bg].basePalette) + (destOffset * 2); cursor = RequestDma3Copy(src, (void *)(paletteOffset + BG_PLTT), size, 0); if (cursor == -1) - { return -1; - } } else { diff --git a/graphics/berry_fix/gba_small.bin b/graphics/berry_fix/gba_connect.bin similarity index 100% rename from graphics/berry_fix/gba_small.bin rename to graphics/berry_fix/gba_connect.bin diff --git a/graphics/berry_fix/gba_connect.png b/graphics/berry_fix/gba_connect.png new file mode 100644 index 0000000000000000000000000000000000000000..78e29251940e358b4b6130a03ea256132482f9f2 GIT binary patch literal 9109 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 KMNUMnLSTXp>_H*` delta 846 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 delta 961 zcmV;y13vtRG4=m0000+_jok`001yhOjJdagA_1-7fyyU000AlNkl8nu5Xbon)@Ia;=#Rufr!clNtAf$Fs$akk2qR+xn0s6xT;$UGoM7 z{4Tu@N}^=BXoqh413_%xPyag}kCKD{wQ97Ha)|$h2fX>w3$33d$OGQ?IWW-rR_kXC zDuA~=i2-nb*zL*=F3x}qYijTvx?!H}xQ4crZN9h)xK#w!2I{f^TESXv>_b}Z1Jp-( zgp_M_t|nm>2=tsC^!y0eNT*?)!*(mrtkZ)`xrTH5NWhk^wVt3+t-u&|fb~I(wY6*I zbZxB`_&Wm|t#9JkTII=F>cN>Y01V;VkUDbq-LKxe;yWe&jhIj!Up0qEDZl}8-6$$(xgw4O_u<`#?%mIV;U zQ>}-Yg-bNB1z^9x^5Iw0guxV2j+bZfP_-! zE^Og{nE;E|D$qq>a+jimBp~(`Wx&u?4Jm4Y)x0RO7BKUC*;SxV4IqFUCuoPf##BM^ z6RJhvYI*{|^|l=#3qV5n>Vui5)Q9%7y@E|E1F?#y<~9|$H^K54xQZ75tU@X>Sgyx6 zQ(XndiwOX@y#O57ps8a3yfQG>IHLuSC z>M{emql6st1B0_V`n)IrbnuTHZOM31aqtc;09ZrC!4m?K_gqgilp~g#iSA5G(`V8OZE0RT*%~09x8V0d=B{+dZWxVce|? zeH)$xvxDbz+rI!ADSva^9TSOAEnmUb`2-^1fbYMod$|~LZe0`jT$v- j)TmLTMvWRZ`fvIT?3k>t0$}!!00000NkvXXu0mjflUK9t diff --git a/graphics/berry_fix/gba_transfer_highlight.pal b/graphics/berry_fix/gba_transfer_highlight.pal deleted file mode 100644 index 0e177217f..000000000 --- a/graphics/berry_fix/gba_transfer_highlight.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -0 0 0 -255 255 255 -32 32 32 -172 172 172 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -164 213 90 -238 230 197 -148 197 213 -32 57 98 -106 148 197 -90 106 156 -255 255 255 -164 213 90 -32 32 32 -123 123 205 -255 255 255 -74 74 115 -197 197 197 -98 98 189 -106 106 197 -98 123 57 -131 131 131 -222 41 0 -189 123 41 -180 180 222 -0 0 0 -0 0 0 diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png index 9fb9b6a48b22e6c9de50ab571dbccc21b1313058..f1845bdafd2f44c5f4a5802851a6574d203fe42d 100644 GIT binary patch delta 6342 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 IM6N<$g130;vH$=8 delta 1007 zcmVm0000+_jok`001yhOjJdal@u_47fyyU000B8Nkl~OVPMlPh3GRdkL`dp0-=eXOZiQZEYPBX z40NS@kn&ZcrUq!UB?CZ)x3^-3-PQv{RPoS)My%jV22P^fc0(yH3F?KZ11`Ov1K0;h zunw0}-lZu4jrbxg33}2^)AW-Lmil=CmN#Vr+|s;%!C5?l53Ow(Xvk^k0fhuhVbpg( zd+nmDmFQ`sXR!c4zeIM16^+%NpbwN`XX=BxrPlM<=t^tJ09oL=wT?Y$9rTon*aFvG zhy&rC39`}bAcD;B##E96RQ#PL3q#@L0P@*5qZzz-322^C1s6U5{aRs+3$Z{awF+R5 z31}F91Ks;7kfviPq3K+yt^)cC{GK|1iof;&@NqMto&lOHDqz4~C)D_tapZu(xBws# z$Lf)nrD*`+0VfEI9v2L}>H(N%fSe>2=u^WQ_s4+Q)By9#yRkd~s3|QP0J#SPoKjr~ zY#F$exMl|c+&oL}_+bFc0AM&N0RqBS2KzF%_SWH`YL-|hCV0+d0~k%Gsc0fxm4F#~vjF7MS7?@2#{1>gv73Z)d~xIU17 z0T1z}=rIw;)eP)&DGXsZty3`@oN^tJrkzeF2a4IkAc0_#Ad@5}LtFqlNeW>=l1}QL zAOPI8Sh8@+yL;Am7i%%hPoPq8V%V$s=GsMXxN@Z)@kFtgdt4R_ch?KP9^h2i+NT^D z;S_JE{TePcOW58jwvYpDCVI+=EaZTHxk2G3;IO$K8OSp4{bj|)EcibL_WPqRI0XFo z69D=<06&DSJ^vVio5;O=90Ks(bijW9%K`q{5rD5KPz?p))0=-O5&*$H1`t3HzUPMd zfK886!CJ-f{7TPZ^$73{qUhi^OLq)#3JwXY$~He2u2E&-YJGssb`+2@3eV+ILxc;3 zs%GdKV1ER_cPe=4ig2@_s=&F;u;vG+EPSVW7r<5IDGWe6_dWe5K&@J}YSpS$t5&UA dwQBt%{RY5zu6OG_Qpo@S002ovPDHLkV1i^h(Eb1b diff --git a/graphics/berry_fix/logo.pal b/graphics/berry_fix/logo.pal deleted file mode 100644 index 4c76f3f9a..000000000 --- a/graphics/berry_fix/logo.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -32 32 32 -172 172 172 -230 8 8 -255 189 115 -32 156 8 -148 246 148 -49 82 205 -164 197 246 -164 213 90 -238 230 197 -148 197 213 -32 57 98 -106 148 197 -90 106 156 -255 255 255 -164 213 90 -32 32 32 -123 123 205 -255 255 255 -74 74 115 -197 197 197 -98 98 189 -106 106 197 -98 123 57 -131 131 131 -222 41 0 -189 123 41 -180 180 222 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -238 238 238 -222 222 230 -205 205 222 -197 197 205 -180 180 197 -164 164 189 -156 156 172 -139 139 164 -123 123 156 -115 115 139 -98 98 131 -82 82 123 -74 74 115 -32 32 32 diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png index 29cda79b0a6c82f5a161c38bb40ad657fef53173..189ca9780235eb79a8817337ddf8e22c71298422 100644 GIT binary patch delta 4540 zcmV;t5ku~)2G%2x7=H)@0001DevN|w01f(jR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3 z004N}?U`MY9JvjI-|G}U0{=je#{mg4!Z+~o{h_8Mt>oQ}@Xv!Eb~pB1U`+fe#SJgD0COZ1;J@M6Mo5grC(%0A5@0{BE^Zi<%KY#J>pI(3D+nWk6Resm6 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 BH<|zd diff --git a/include/graphics.h b/include/graphics.h index 04ad64606..2bfdc5537 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3186,9 +3186,9 @@ extern const u16 gWallClockFemale_Pal[]; extern const u32 gWallClockStart_Tilemap[]; extern const u32 gWallClockView_Tilemap[]; -extern const u32 gBerryFixGameboy_Gfx[]; -extern const u32 gBerryFixGameboy_Tilemap[]; -extern const u16 gBerryFixGameboy_Pal[]; +extern const u32 gBerryFixGbaConnect_Gfx[]; +extern const u32 gBerryFixGbaConnect_Tilemap[]; +extern const u16 gBerryFixGbaConnect_Pal[]; extern const u32 gBerryFixGameboyLogo_Gfx[]; extern const u32 gBerryFixGameboyLogo_Tilemap[]; extern const u16 gBerryFixGameboyLogo_Pal[]; diff --git a/src/berry_fix_graphics.c b/src/berry_fix_graphics.c index b37645d4c..d766c3966 100644 --- a/src/berry_fix_graphics.c +++ b/src/berry_fix_graphics.c @@ -8,9 +8,9 @@ static const struct { const u16 *pltt; } sBerryFixGraphics[] = { { - gBerryFixGameboy_Gfx, - gBerryFixGameboy_Tilemap, - gBerryFixGameboy_Pal + gBerryFixGbaConnect_Gfx, + gBerryFixGbaConnect_Tilemap, + gBerryFixGbaConnect_Pal }, { gBerryFixGameboyLogo_Gfx, gBerryFixGameboyLogo_Tilemap, @@ -43,7 +43,7 @@ static void LoadBerryFixGraphics(u32 idx) REG_BLDCNT = 0; LZ77UnCompVram(sBerryFixGraphics[idx].gfx, (void *)BG_CHAR_ADDR(0)); LZ77UnCompVram(sBerryFixGraphics[idx].tilemap, (void *)BG_SCREEN_ADDR(31)); - CpuCopy16(sBerryFixGraphics[idx].pltt, (void *)PLTT, 0x200); - REG_BG0CNT = 0x1f00; + CpuCopy16(sBerryFixGraphics[idx].pltt, (void *)BG_PLTT, BG_PLTT_SIZE); + REG_BG0CNT = BGCNT_SCREENBASE(31); REG_DISPCNT = DISPCNT_BG0_ON; } diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 26af445a0..5900cb298 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -117,13 +117,7 @@ static const struct WindowTemplate sBerryFixWindowTemplates[] = { DUMMY_WIN_TEMPLATE }; -static const u16 ALIGNED(4) sBerryFixPalColors[] = { - RGB_WHITE, RGB_WHITE, RGB(12, 12, 12), RGB(26, 26, 25), - RGB(28, 1, 1), RGB(31, 23, 14), RGB(4, 19, 1), RGB(18, 30, 18), - RGB(6, 10, 25), RGB(20, 24, 30), RGB_WHITE, RGB(12, 12, 12), - RGB(26, 26, 25), RGB_BLACK, RGB_BLACK, RGB_BLACK -}; - +static const u16 ALIGNED(4) sText_Pal[] = INCBIN_U16("graphics/berry_fix/text.gbapal"); static const u8 sBerryProgramTextColors[] = {TEXT_DYNAMIC_COLOR_1, TEXT_DYNAMIC_COLOR_2, TEXT_DYNAMIC_COLOR_3}; static const u8 sGameTitleTextColors[] = { TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_DYNAMIC_COLOR_4}; @@ -152,9 +146,9 @@ static const struct { const u16 *palette; } sBerryFixGraphics[] = { [SCENE_ENSURE_CONNECT] = { - gBerryFixGameboy_Gfx, - gBerryFixGameboy_Tilemap, - gBerryFixGameboy_Pal + gBerryFixGbaConnect_Gfx, + gBerryFixGbaConnect_Tilemap, + gBerryFixGbaConnect_Pal }, [SCENE_TURN_OFF_POWER] = { gBerryFixGameboyLogo_Gfx, @@ -304,7 +298,7 @@ static void BerryFix_GpuSet(void) InitWindows(sBerryFixWindowTemplates); DeactivateAllTextPrinters(); - DmaCopy32(3, sBerryFixPalColors, BG_PLTT + 0x1E0, sizeof(sBerryFixPalColors)); + DmaCopy32(3, sText_Pal, BG_PLTT + PLTT_OFFSET_4BPP(15), sizeof(sText_Pal)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); FillWindowPixelBuffer(WIN_GAME_NAMES, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TURN_OFF_TITLE, PIXEL_FILL(0)); @@ -374,7 +368,9 @@ static void BerryFix_SetScene(int scene) CopyBgTilemapBufferToVram(0); LZ77UnCompVram(sBerryFixGraphics[scene].gfx, (void *)BG_CHAR_ADDR(1)); LZ77UnCompVram(sBerryFixGraphics[scene].tilemap, (void *)BG_SCREEN_ADDR(31)); - CpuCopy32(sBerryFixGraphics[scene].palette, (void *)BG_PLTT, 0x100); + // These palettes range in size from 32-48 colors, so the below is interpreting whatever + // follows the palette (by default, the corresponding tiles) as the remaining 80-96. + CpuCopy32(sBerryFixGraphics[scene].palette, (void *)BG_PLTT, PLTT_SIZEOF(128)); ShowBg(0); ShowBg(1); } diff --git a/src/data/graphics/berry_fix.h b/src/data/graphics/berry_fix.h index 07e2cbf51..0c26f7e92 100644 --- a/src/data/graphics/berry_fix.h +++ b/src/data/graphics/berry_fix.h @@ -1,6 +1,6 @@ -const u16 gBerryFixGameboy_Pal[] = INCBIN_U16("graphics/berry_fix/gba_small.gbapal"); -const u32 gBerryFixGameboy_Gfx[] = INCBIN_U32("graphics/berry_fix/gba_small.4bpp.lz"); -const u32 gBerryFixGameboy_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_small.bin.lz"); +const u16 gBerryFixGbaConnect_Pal[] = INCBIN_U16("graphics/berry_fix/gba_connect.gbapal"); +const u32 gBerryFixGbaConnect_Gfx[] = INCBIN_U32("graphics/berry_fix/gba_connect.4bpp.lz"); +const u32 gBerryFixGbaConnect_Tilemap[] = INCBIN_U32("graphics/berry_fix/gba_connect.bin.lz"); const u16 gBerryFixGameboyLogo_Pal[] = INCBIN_U16("graphics/berry_fix/logo.gbapal"); const u32 gBerryFixGameboyLogo_Gfx[] = INCBIN_U32("graphics/berry_fix/logo.4bpp.lz");