ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use tag constants in region_map.c

Browse Source
This commit is contained in:
GriffinR 2021-08-11 09:31:20 -04:00
parent d391486247
commit d951d7c363
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/region_map.c
View File

@ -48,6 +48,12 @@
#define FLYDESTICON_RED_OUTLINE 6 #define FLYDESTICON_RED_OUTLINE 6
enum {
TAG_CURSOR,
TAG_PLAYER_ICON,
TAG_FLY_ICON,
};
// Static type declarations // Static type declarations
struct MultiNameFlyDest struct MultiNameFlyDest
@ -237,13 +243,13 @@ static const union AnimCmd *const sRegionMapCursorAnimTable[] =
static const struct SpritePalette sRegionMapCursorSpritePalette = static const struct SpritePalette sRegionMapCursorSpritePalette =
{ {
.data = sRegionMapCursorPal, .data = sRegionMapCursorPal,
.tag = 0 .tag = TAG_CURSOR
}; };
static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = static const struct SpriteTemplate sRegionMapCursorSpriteTemplate =
{ {
.tileTag = 0, .tileTag = TAG_CURSOR,
.paletteTag = 0, .paletteTag = TAG_CURSOR,
.oam = &sRegionMapCursorOam, .oam = &sRegionMapCursorOam,
.anims = sRegionMapCursorAnimTable, .anims = sRegionMapCursorAnimTable,
.images = NULL, .images = NULL,
@ -419,7 +425,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] =
static const struct SpritePalette sFlyTargetIconsSpritePalette = static const struct SpritePalette sFlyTargetIconsSpritePalette =
{ {
.data = sFlyTargetIcons_Pal, .data = sFlyTargetIcons_Pal,
.tag = 2 .tag = TAG_FLY_ICON
}; };
static const u16 sRedOutlineFlyDestinations[][2] = static const u16 sRedOutlineFlyDestinations[][2] =
@ -497,8 +503,8 @@ static const union AnimCmd *const sFlyDestIcon_Anims[] =
static const struct SpriteTemplate sFlyDestIconSpriteTemplate = static const struct SpriteTemplate sFlyDestIconSpriteTemplate =
{ {
.tileTag = 2, .tileTag = TAG_FLY_ICON,
.paletteTag = 2, .paletteTag = TAG_FLY_ICON,
.oam = &sFlyDestIcon_OamData, .oam = &sFlyDestIcon_OamData,
.anims = sFlyDestIcon_Anims, .anims = sFlyDestIcon_Anims,
.images = NULL, .images = NULL,
@ -1692,8 +1698,8 @@ void CB2_OpenFlyMap(void)
break; break;
case 4: case 4:
InitRegionMap(&sFlyMap->regionMap, FALSE); InitRegionMap(&sFlyMap->regionMap, FALSE);
CreateRegionMapCursor(0, 0); CreateRegionMapCursor(TAG_CURSOR, TAG_CURSOR);
CreateRegionMapPlayerIcon(1, 1); CreateRegionMapPlayerIcon(TAG_PLAYER_ICON, TAG_PLAYER_ICON);
sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId; sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId;
StringFill(sFlyMap->nameBuffer, CHAR_SPACE, MAP_NAME_LENGTH); StringFill(sFlyMap->nameBuffer, CHAR_SPACE, MAP_NAME_LENGTH);
sDrawFlyDestTextWindow = TRUE; sDrawFlyDestTextWindow = TRUE;
@ -1827,7 +1833,7 @@ static void LoadFlyDestIcons(void)
LZ77UnCompWram(sFlyTargetIcons_Gfx, sFlyMap->tileBuffer); LZ77UnCompWram(sFlyTargetIcons_Gfx, sFlyMap->tileBuffer);
sheet.data = sFlyMap->tileBuffer; sheet.data = sFlyMap->tileBuffer;
sheet.size = sizeof(sFlyMap->tileBuffer); sheet.size = sizeof(sFlyMap->tileBuffer);
sheet.tag = 2; sheet.tag = TAG_FLY_ICON;
LoadSpriteSheet(&sheet); LoadSpriteSheet(&sheet);
LoadSpritePalette(&sFlyTargetIconsSpritePalette); LoadSpritePalette(&sFlyTargetIconsSpritePalette);
CreateFlyDestIcons(); CreateFlyDestIcons();