Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add red and leaf icons to frlg map (#9357)

Browse Source
This commit is contained in:
FosterProgramming 2026-02-27 12:24:16 +01:00 committed by GitHub
parent 59776b997b
commit edc164e247
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/pokenav/region_map/leaf_icon.pal Normal file
View File

@ -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

BIN
graphics/pokenav/region_map/leaf_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

19
graphics/pokenav/region_map/red_icon.pal Normal file
View File

@ -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

BIN
graphics/pokenav/region_map/red_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 B

16
src/region_map.c
View File

@ -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);