From edc164e2473f6df42b231738c4c94f1513df1b33 Mon Sep 17 00:00:00 2001 From: FosterProgramming Date: Fri, 27 Feb 2026 12:24:16 +0100 Subject: [PATCH] Add red and leaf icons to frlg map (#9357) --- graphics/pokenav/region_map/leaf_icon.pal | 19 +++++++++++++++++++ graphics/pokenav/region_map/leaf_icon.png | Bin 0 -> 244 bytes graphics/pokenav/region_map/red_icon.pal | 19 +++++++++++++++++++ graphics/pokenav/region_map/red_icon.png | Bin 0 -> 233 bytes src/region_map.c | 16 +++++++++++++++- 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 graphics/pokenav/region_map/leaf_icon.pal create mode 100644 graphics/pokenav/region_map/leaf_icon.png create mode 100644 graphics/pokenav/region_map/red_icon.pal create mode 100644 graphics/pokenav/region_map/red_icon.png diff --git a/graphics/pokenav/region_map/leaf_icon.pal b/graphics/pokenav/region_map/leaf_icon.pal new file mode 100644 index 0000000000..27436be920 --- /dev/null +++ b/graphics/pokenav/region_map/leaf_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/pokenav/region_map/leaf_icon.png b/graphics/pokenav/region_map/leaf_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..879634e70940c715b5d35c71f39ec58a309a5400 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUEk3$rO||3yqf_opDXw+| zf~%I6)x}GWW@&1^d-s3KmaG4>ypCF0{=XNsca9}c(<6y)S0Ke$666=m;PC858jw@u z>Eal|F*7;g0Mn%g2A9oi=U5hpF?ARUb2#*@nYy|BTojwgjM7(EW|?XWHyCA~n`6m3 z0UHIhZ+)6p9qH*frB4tUkQaie`e o*Te3^|Nra!bC~?ozQK@TSE|;JXS3IP0c~gSboFyt=akR{0H`5lhyVZp literal 0 HcmV?d00001 diff --git a/graphics/pokenav/region_map/red_icon.pal b/graphics/pokenav/region_map/red_icon.pal new file mode 100644 index 0000000000..27436be920 --- /dev/null +++ b/graphics/pokenav/region_map/red_icon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +65 65 213 +57 57 123 +115 164 197 +106 41 41 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +189 156 57 +0 0 0 diff --git a/graphics/pokenav/region_map/red_icon.png b/graphics/pokenav/region_map/red_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba4998c5e569cf881816601ff0c6b2b17882ac6 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUEk3$rO||3yqf_opDXw+| zf~%I6)x}GWW@&1^d-s3KmaG4>ypCF0{=XNsca9}c(<6y)S0Ke$666=m;PC858jzFj z>Eal|F*7;g0FzY%gG=$8dwZ+>nL9R0b2#+KO*p}+@c8`9$;Id9up3@mV_C{|;=%M2 zb1aLa9<#I6Rd3$1<;i(@35k6YwU@%bv9J1>^JK}Q9R8FI64IK|)(t)Xl5*bgZ+!E= cK4mpy&t~FVdQ&MBb@00%r>9{>OV literal 0 HcmV?d00001 diff --git a/src/region_map.c b/src/region_map.c index 196d0ce2e4..2320a7ec9e 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -127,6 +127,10 @@ static const u16 sRegionMapPlayerIcon_BrendanPal[] = INCBIN_U16("graphics/pokena static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/region_map/brendan_icon.4bpp"); static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/region_map/may_icon.gbapal"); static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/region_map/may_icon.4bpp"); +static const u16 sRegionMapPlayerIcon_RedPal[] = INCBIN_U16("graphics/pokenav/region_map/red_icon.gbapal"); +static const u8 sRegionMapPlayerIcon_RedGfx[] = INCBIN_U8("graphics/pokenav/region_map/red_icon.4bpp"); +static const u16 sRegionMapPlayerIcon_LeafPal[] = INCBIN_U16("graphics/pokenav/region_map/leaf_icon.gbapal"); +static const u8 sRegionMapPlayerIcon_LeafGfx[] = INCBIN_U8("graphics/pokenav/region_map/leaf_icon.4bpp"); #include "data/region_map/region_map_layout.h" #include "data/region_map/region_map_entries.h" @@ -1736,11 +1740,21 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) sRegionMap->playerIconSprite = NULL; return; } - if (gSaveBlock2Ptr->playerGender == FEMALE) + if (IS_FRLG && gSaveBlock2Ptr->playerGender == FEMALE) + { + sheet.data = sRegionMapPlayerIcon_LeafGfx; + palette.data = sRegionMapPlayerIcon_LeafPal; + } + else if (gSaveBlock2Ptr->playerGender == FEMALE) { sheet.data = sRegionMapPlayerIcon_MayGfx; palette.data = sRegionMapPlayerIcon_MayPal; } + else if (IS_FRLG) + { + sheet.data = sRegionMapPlayerIcon_RedGfx; + palette.data = sRegionMapPlayerIcon_RedPal; + } LoadSpriteSheet(&sheet); LoadSpritePalette(&palette); spriteId = CreateSprite(&template, 0, 0, 1);